diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-20 22:50:29 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-20 22:50:29 +0000 |
| commit | 08aa2c9bd2a3b5d26693ee3a58c38eedc9ee3246 (patch) | |
| tree | ce95a465fcf9cdd89a5100c7ccc6b683b5d1c2a5 /libavcodec/Makefile | |
| parent | ca6e50afc13acdd764527c0fcfe13d1ea90b4d98 (diff) | |
| download | ffmpeg-08aa2c9bd2a3b5d26693ee3a58c38eedc9ee3246.tar.gz | |
remove dependency of mpeg audio encoder over mpeg audio decoder
Originally committed as revision 9082 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 12381af255..d56ca58de4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -19,7 +19,7 @@ OBJS= bitstream.o \ motion_est.o \ imgconvert.o \ mpeg12.o \ - mpegaudiodec.o mpegaudiodecheader.o mpegaudiodata.o \ + mpegaudiodec.o mpegaudiodecheader.o mpegaudiodata.o mpegaudio.o \ simple_idct.o \ ratecontrol.o \ eval.o \ @@ -108,7 +108,7 @@ 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_ENCODER) += mpegaudio.o mpegaudiodata.o +OBJS-$(CONFIG_MP2_ENCODER) += mpegaudioenc.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MPC7_DECODER) += mpc.o OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o |