diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-20 22:59:32 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-20 22:59:32 +0000 |
| commit | 9f77cab2a0b770a73169b27659bc4e894cd4e805 (patch) | |
| tree | 8741a2d0a93e58ce4a82381e8410f2a3bb018726 /libavcodec/Makefile | |
| parent | 08aa2c9bd2a3b5d26693ee3a58c38eedc9ee3246 (diff) | |
| download | ffmpeg-streaming-9f77cab2a0b770a73169b27659bc4e894cd4e805.zip ffmpeg-streaming-9f77cab2a0b770a73169b27659bc4e894cd4e805.tar.gz | |
make compilation of mpegaudiodec conditional
Originally committed as revision 9083 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d56ca58..0592084 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -19,7 +19,6 @@ OBJS= bitstream.o \ motion_est.o \ imgconvert.o \ mpeg12.o \ - mpegaudiodec.o mpegaudiodecheader.o mpegaudiodata.o mpegaudio.o \ simple_idct.o \ ratecontrol.o \ eval.o \ @@ -108,8 +107,12 @@ OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o mpegvideo.o OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o +OBJS-$(CONFIG_MP2_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MP2_ENCODER) += mpegaudioenc.o mpegaudio.o mpegaudiodata.o -OBJS-$(CONFIG_MPC7_DECODER) += mpc.o +OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o +OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o +OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o +OBJS-$(CONFIG_MPC7_DECODER) += mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o @@ -128,7 +131,7 @@ OBJS-$(CONFIG_PNG_DECODER) += png.o OBJS-$(CONFIG_PNG_ENCODER) += png.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PTX_DECODER) += ptx.o -OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o mdct.o fft.o +OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o mdct.o fft.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.o OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o |
