mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-28 12:32:17 +02:00
Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'
* commit '93e65e9a6c0895f869752a66731d9b2ec3916467': Cosmetics, restore alphabetic order in atomics lists. Conflicts: libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b2175b0f2a
2
configure
vendored
2
configure
vendored
@ -1275,8 +1275,8 @@ THREADS_LIST='
|
|||||||
|
|
||||||
ATOMICS_LIST='
|
ATOMICS_LIST='
|
||||||
atomics_gcc
|
atomics_gcc
|
||||||
atomics_win32
|
|
||||||
atomics_suncc
|
atomics_suncc
|
||||||
|
atomics_win32
|
||||||
'
|
'
|
||||||
|
|
||||||
ARCH_LIST='
|
ARCH_LIST='
|
||||||
|
@ -114,9 +114,9 @@ OBJS += $(COMPAT_OBJS:%=../compat/%)
|
|||||||
|
|
||||||
SKIPHEADERS = old_pix_fmts.h
|
SKIPHEADERS = old_pix_fmts.h
|
||||||
|
|
||||||
|
SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h
|
||||||
SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h
|
SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h
|
||||||
SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h
|
SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h
|
||||||
SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h
|
|
||||||
SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h
|
SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h
|
||||||
|
|
||||||
TESTPROGS = adler32 \
|
TESTPROGS = adler32 \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user