diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-06 03:02:38 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-06 03:33:58 +0200 |
commit | f9569249c274ab71b570d6a462903379e9d414fb (patch) | |
tree | 0b8f8c4930874a5115f6608a23b55eb2f5be1c34 /libavcodec/Makefile | |
parent | 6700aa8810d877cb017d977f12638481df459eb1 (diff) | |
parent | eb7505e4295dca9c3ab8c01e055a458e07857ef0 (diff) | |
download | ffmpeg-streaming-f9569249c274ab71b570d6a462903379e9d414fb.zip ffmpeg-streaming-f9569249c274ab71b570d6a462903379e9d414fb.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove some unused scripts from tools/.
Add x86 assembly for some 10-bit H.264 intra predict functions.
v4l2: do not force NTSC as standard
Skip tableprint.h during 'make checkheaders'.
Remove unnecessary LIBAVFORMAT_BUILD #ifdef.
Drop explicit filenames from @file Doxygen tags.
Skip generated table headers during 'make checkheaders'.
lavf,lavc: free avoptions in a generic way.
AVOptions: add av_opt_free convenience function.
tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS.
tiff: print log in case of unknown / unsupported tag.
tiff: fix linesize for mono-white/black formats.
Fix build of eval-test program
configure: Document --enable-vaapi
ac3enc: extract all exponents for the frame at once
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 768bbde..2721423 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -666,8 +666,12 @@ OBJS-$(!CONFIG_SMALL) += inverse.o -include $(SUBDIR)$(ARCH)/Makefile -SKIPHEADERS += %_tablegen.h aac_tablegen_decl.h \ - fft-internal.h $(ARCH)/vp56_arith.h +SKIPHEADERS += %_tablegen.h \ + %_tables.h \ + aac_tablegen_decl.h \ + fft-internal.h \ + tableprint.h \ + $(ARCH)/vp56_arith.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBDIRAC) += libdirac.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h @@ -675,7 +679,7 @@ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h -TESTPROGS = cabac dct eval fft fft-fixed h264 iirfilter rangecoder snow +TESTPROGS = cabac dct fft fft-fixed h264 iirfilter rangecoder snow TESTPROGS-$(HAVE_MMX) += motion TESTOBJS = dctref.o |