diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 22:04:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 22:22:06 +0200 |
| commit | b2175b0f2a7cfdcc784ec2eabab4f6da3b0e6979 (patch) | |
| tree | c33d11aa28730f9025b95e3c7c935def76fa29a3 | |
| parent | 9ab221f8d82da9e2cf1503cc5db115838d766d97 (diff) | |
| parent | 93e65e9a6c0895f869752a66731d9b2ec3916467 (diff) | |
| download | ffmpeg-streaming-b2175b0f2a7cfdcc784ec2eabab4f6da3b0e6979.zip ffmpeg-streaming-b2175b0f2a7cfdcc784ec2eabab4f6da3b0e6979.tar.gz | |
Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'
* commit '93e65e9a6c0895f869752a66731d9b2ec3916467':
Cosmetics, restore alphabetic order in atomics lists.
Conflicts:
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1275,8 +1275,8 @@ THREADS_LIST=' ATOMICS_LIST=' atomics_gcc - atomics_win32 atomics_suncc + atomics_win32 ' ARCH_LIST=' diff --git a/libavutil/Makefile b/libavutil/Makefile index 04dcdbb..33f82ed 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -114,9 +114,9 @@ OBJS += $(COMPAT_OBJS:%=../compat/%) SKIPHEADERS = old_pix_fmts.h +SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h -SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h TESTPROGS = adler32 \ |
