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 | |
| 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>
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libswresample/Makefile | 2 |
4 files changed, 8 insertions, 8 deletions
@@ -1674,7 +1674,7 @@ atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" binkaudio_dct_decoder_select="mdct rdft dct sinewin" binkaudio_rdft_decoder_select="mdct rdft sinewin" -cavs_decoder_select="golomb mpegvideo" +cavs_decoder_select="golomb h264chroma mpegvideo" comfortnoise_encoder_select="lpc" cook_decoder_select="mdct sinewin" cscd_decoder_select="lzo" @@ -1762,8 +1762,8 @@ rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvi rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" shorten_decoder_select="golomb" sipr_decoder_select="lsp" -snow_decoder_select="dwt rangecoder" -snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder" +snow_decoder_select="dwt h264qpel rangecoder" +snow_encoder_select="aandcttables dwt h264qpel error_resilience mpegvideoenc rangecoder" sonic_decoder_select="golomb" sonic_encoder_select="golomb" sonic_ls_encoder_select="golomb" @@ -1783,8 +1783,8 @@ vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" vp3_decoder_select="vp3dsp videodsp" -vp5_decoder_select="vp3dsp videodsp" -vp6_decoder_select="huffman vp3dsp videodsp" +vp5_decoder_select="h264chroma vp3dsp videodsp" +vp6_decoder_select="h264chroma huffman vp3dsp videodsp" vp6a_decoder_select="vp6_decoder" vp6f_decoder_select="vp6_decoder" vp8_decoder_select="h264pred videodsp" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 52282e30d0..dc065a51d4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -25,7 +25,6 @@ OBJS = allcodecs.o \ fmtconvert.o \ imgconvert.o \ jrevdct.o \ - log2_tab.o \ mathtables.o \ options.o \ parser.o \ @@ -70,6 +69,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ OBJS-$(CONFIG_RANGECODER) += rangecoder.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) +OBJS-$(CONFIG_SHARED) += log2_tab.o OBJS-$(CONFIG_SINEWIN) += sinewin.o OBJS-$(CONFIG_VAAPI) += vaapi.o OBJS-$(CONFIG_VDPAU) += vdpau.o 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 diff --git a/libswresample/Makefile b/libswresample/Makefile index 9d9f10c6c6..0b75bd0821 100644 --- a/libswresample/Makefile +++ b/libswresample/Makefile @@ -8,11 +8,11 @@ HEADERS = swresample.h \ OBJS = audioconvert.o \ dither.o \ - log2_tab.o \ rematrix.o \ resample.o \ swresample.o \ OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o +OBJS-$(CONFIG_SHARED) += log2_tab.o TESTPROGS = swresample |