Commit a79d1aed authored by Diego Biurrun's avatar Diego Biurrun

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
parent a3341b9d
...@@ -932,7 +932,6 @@ eac3_decoder_select="fft" ...@@ -932,7 +932,6 @@ eac3_decoder_select="fft"
flashsv_decoder_deps="zlib" flashsv_decoder_deps="zlib"
flashsv_encoder_deps="zlib" flashsv_encoder_deps="zlib"
imc_decoder_select="fft" imc_decoder_select="fft"
mlp_decoder_deps="mlp_parser"
mpeg_xvmc_decoder_deps="xvmc" mpeg_xvmc_decoder_deps="xvmc"
nellymoser_decoder_select="fft" nellymoser_decoder_select="fft"
nellymoser_encoder_select="fft" nellymoser_encoder_select="fft"
......
...@@ -113,7 +113,7 @@ OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o ...@@ -113,7 +113,7 @@ OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o
OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.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_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_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_MMVIDEO_DECODER) += mmvideo.o
OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o
OBJS-$(CONFIG_MP2_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MP2_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment