Move declaration of mlp decoder dependency on mlp parser to the Makefile

where all other such dependencies are declared.

Originally committed as revision 15696 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 6510d884236cb30774e312cb8fc9d9ac249e80f0..8c31782b08256176d6529bc14acc35d789954ee4 100755 (executable)
--- a/configure
+++ b/configure
@@ -932,7 +932,6 @@ eac3_decoder_select="fft"
 flashsv_decoder_deps="zlib"
 flashsv_encoder_deps="zlib"
 imc_decoder_select="fft"
-mlp_decoder_deps="mlp_parser"
 mpeg_xvmc_decoder_deps="xvmc"
 nellymoser_decoder_select="fft"
 nellymoser_encoder_select="fft"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5b176ecece53c2c59ab5b1d2caa4bfa9002cd956..9a73cb9434b72637e23655d70a6a1ccf5e92b962 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -113,7 +113,7 @@ OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.o
 OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o mjpeg.o
 OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
 OBJS-$(CONFIG_MJPEGB_DECODER)          += mjpegbdec.o mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_MLP_DECODER)             += mlp.o mlpdec.o
+OBJS-$(CONFIG_MLP_DECODER)             += mlpdec.o mlp_parser.o mlp.o
 OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
 OBJS-$(CONFIG_MOTIONPIXELS_DECODER)    += motionpixels.o
 OBJS-$(CONFIG_MP2_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o