diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 21:26:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 21:34:24 +0100 |
| commit | d64b8540751bf8debab4ebcfad6ff87c61d3c19d (patch) | |
| tree | a275f8c86ca44c3fa3743b91702b3f8c8f9fbcff /libavutil/Makefile | |
| parent | 212b89f8b426d78e1be8be45daaa6604fd0f35c4 (diff) | |
| parent | 666fe5da47d127074be7f0e2bac93db6af8b4a30 (diff) | |
| download | ffmpeg-d64b8540751bf8debab4ebcfad6ff87c61d3c19d.tar.gz | |
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>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 87e222bb1c..103ce5ea6c 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -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 \ |