Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

* commit '666fe5da47d127074be7f0e2bac93db6af8b4a30': atomic: Exclude the unsupported implementation headers from checkheaders avconv: do not silently ignore unused codec AVOptions. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:26:13 +01:00
parent 212b89f8b4 666fe5da47
commit d64b854075
4 changed files with 96 additions and 1 deletions
@@ -111,6 +111,10 @@ OBJS += $(COMPAT_OBJS:%=../compat/%)

 SKIPHEADERS          = old_pix_fmts.h

+SKIPHEADERS-$(HAVE_MACHINE_RW_BARRIER)          += atomic_suncc.h
+SKIPHEADERS-$(HAVE_MEMORYBARRIER)               += atomic_win32.h
+SKIPHEADERS-$(HAVE_SYNC_VAL_COMPARE_AND_SWAP)   += atomic_gcc.h
+
 TESTPROGS = adler32                                                     \
            aes                                                         \
            atomic                                                      \