diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-03-06 13:04:03 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-03-06 18:23:41 +0100 |
| commit | d48430c367947a64647c6959cf472f2c01778b17 (patch) | |
| tree | 0d0206a97b536a38ee62ac00c93eb48f12861b46 | |
| parent | 84bf8817206126dab3c9abf6055b593389bcb241 (diff) | |
| download | ffmpeg-d48430c367947a64647c6959cf472f2c01778b17.tar.gz | |
build: Let the SVQ3 decoder depend on the H.264 decoder
The SVQ3 decoder reuses large parts of the H.264 decoder so it
makes no sense to enable the former but not the latter.
Also drop unnecessary h263.o object from SVQ3 decoder object list.
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/Makefile | 5 |
2 files changed, 3 insertions, 6 deletions
@@ -1766,8 +1766,8 @@ sipr_decoder_select="lsp" sp5x_decoder_select="mjpeg_decoder" svq1_decoder_select="hpeldsp" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" -svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp" -svq3_decoder_suggest="error_resilience zlib" +svq3_decoder_select="h264_decoder hpeldsp mpegvideo" +svq3_decoder_suggest="zlib" tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 44d5ae66ab..bd93a6f578 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -335,10 +335,7 @@ OBJS-$(CONFIG_SUNRAST_ENCODER) += sunrastenc.o OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o svq13.o h263.o OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o \ h263.o ituh263enc.o -OBJS-$(CONFIG_SVQ3_DECODER) += svq3.o svq13.o h263.o h264.o \ - h264_loopfilter.o h264_direct.o \ - h264_sei.o h264_ps.o h264_refs.o \ - h264_cavlc.o h264_cabac.o cabac.o +OBJS-$(CONFIG_SVQ3_DECODER) += svq3.o svq13.o OBJS-$(CONFIG_TAK_DECODER) += takdec.o tak.o OBJS-$(CONFIG_TARGA_DECODER) += targa.o OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o |