diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-06-20 05:55:11 -0700 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-06-22 06:28:46 -0700 |
commit | c54e118722cbbdc04945538d1796d4472a1ff406 (patch) | |
tree | 32f64bd75ff0dc44b70121351d50a68ce4260fd1 | |
parent | 85d805d5cccb2f57e7f2e2254d7a870f05926cfd (diff) | |
download | ffmpeg-c54e118722cbbdc04945538d1796d4472a1ff406.tar.gz |
build: Have the eatqi decoder depend on the MPEG-1 decoder
eatqi uses more than just the shared mpegvideo bits.
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | libavcodec/Makefile | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -1749,7 +1749,7 @@ eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables blockdsp dsputil mpegvideo" eatgq_decoder_select="aandcttables dsputil" -eatqi_decoder_select="aandcttables blockdsp dsputil error_resilience mpegvideo" +eatqi_decoder_select="aandcttables blockdsp dsputil mpeg1video_decoder" exr_decoder_deps="zlib" ffv1_decoder_select="golomb rangecoder" ffv1_encoder_select="rangecoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9cf2bea2fc..8f6afb01fc 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -170,8 +170,7 @@ OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ mpeg12data.o OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o -OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12dec.o \ - mpeg12.o mpeg12data.o +OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o |