diff options
Diffstat (limited to 'libavutil/atomic.h')
| -rw-r--r-- | libavutil/atomic.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavutil/atomic.h b/libavutil/atomic.h index dad93bd..1d2a345 100644 --- a/libavutil/atomic.h +++ b/libavutil/atomic.h @@ -1,20 +1,20 @@ /* * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -23,10 +23,10 @@ #include "config.h" -#if HAVE_MEMORYBARRIER -#include "atomic_win32.h" -#elif HAVE_SYNC_SYNCHRONIZE +#if HAVE_SYNC_VAL_COMPARE_AND_SWAP #include "atomic_gcc.h" +#elif HAVE_MEMORYBARRIER +#include "atomic_win32.h" #elif HAVE_MACHINE_RW_BARRIER #include "atomic_suncc.h" #else |
