diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:39:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:39:53 +0200 |
| commit | 9d91fae8a1091393ad96585324acc2328d8138f2 (patch) | |
| tree | 97b9125204f1cb0c23dc75dc08253555611b0157 | |
| parent | 9e8c92226fe18a21b6605550a50b67066a6bffd9 (diff) | |
| parent | c54e118722cbbdc04945538d1796d4472a1ff406 (diff) | |
| download | ffmpeg-9d91fae8a1091393ad96585324acc2328d8138f2.tar.gz | |
Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'
* commit 'c54e118722cbbdc04945538d1796d4472a1ff406':
build: Have the eatqi decoder depend on the MPEG-1 decoder
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -2043,7 +2043,7 @@ eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables blockdsp dsputil mpegvideo" eatgq_decoder_select="aandcttables" -eatqi_decoder_select="aandcttables blockdsp dsputil error_resilience mpegvideo" +eatqi_decoder_select="aandcttables blockdsp dsputil mpeg1video_decoder" exr_decoder_select="zlib" ffv1_decoder_select="golomb rangecoder" ffv1_encoder_select="rangecoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7a5ff39753..9924ea6aeb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -206,8 +206,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 |