diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-10-25 01:21:43 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-10-25 01:21:43 +0000 |
| commit | a79d1aed4884cedb360cbc1c177b1304eb63195d (patch) | |
| tree | f10e27356ce3a59a7138fae6e2414506df9ff994 | |
| parent | a3341b9da61431480c64e375d0ef842c4305ab3c (diff) | |
| download | ffmpeg-a79d1aed4884cedb360cbc1c177b1304eb63195d.tar.gz | |
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
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -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 5b176ecece..9a73cb9434 100644 --- 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 |