aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-12-29 14:18:27 +0000
committerDiego Biurrun <diego@biurrun.de>2009-12-29 14:18:27 +0000
commit2cca233bc988f386ccd80c59b78c4db154c88955 (patch)
tree396aa1a76314530436375f524fadc14aab6efdcc
parentaec09a004c15101318b61f3fd494d32261fd8829 (diff)
downloadffmpeg-2cca233bc988f386ccd80c59b78c4db154c88955.tar.gz
The MLP decoder depends on the MLP parser.
Originally committed as revision 20966 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure1
-rw-r--r--libavcodec/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 52828e95b4..60e16c1153 100755
--- a/configure
+++ b/configure
@@ -1123,6 +1123,7 @@ jpegls_encoder_select="golomb"
ljpeg_encoder_select="aandct"
loco_decoder_select="golomb"
mjpeg_encoder_select="aandct"
+mlp_decoder_select="mlp_parser"
mpeg1video_encoder_select="aandct"
mpeg2video_encoder_select="aandct"
mpeg4_decoder_select="h263_decoder mpeg4video_parser"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f9b6e9ac2c..5210d4870c 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -163,7 +163,7 @@ OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o \
ratecontrol.o mpeg12data.o \
mpegvideo.o
OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlp_parser.o mlp.o mlpdsp.o
+OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o
OBJS-$(CONFIG_MP1_DECODER) += mpegaudiodec.o mpegaudiodecheader.o \