diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-04 14:45:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-04 14:45:52 +0100 |
| commit | 144da7eeca9c54691cca8744cdb7ee7cabe1abfb (patch) | |
| tree | cae8f8ffb3c12c3276cbff06e77a7099c8a67f99 /libavformat | |
| parent | 53ca0cb8d46f08350de0c9e470c15a57c6c3a1ea (diff) | |
| parent | 03148fd1743fca98c2f4b5920b796f381e820045 (diff) | |
| download | ffmpeg-144da7eeca9c54691cca8744cdb7ee7cabe1abfb.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
buildsys: only include log2_tab per library for shared builds
Add h264chroma dependency for cavs decoder to configure.
Add h264qpel dependency for snow codec to configure.
Add h264chroma dependency for vp5 and vp6 decoder to configure.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 03d7e2357b..73ada77275 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -13,7 +13,6 @@ OBJS = allformats.o \ cutils.o \ id3v1.o \ id3v2.o \ - log2_tab.o \ metadata.o \ mux.o \ options.o \ @@ -48,6 +47,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_xiph.o \ srtp.o OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o +OBJS-$(CONFIG_SHARED) += log2_tab.o # muxers/demuxers OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o |