diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-08-06 13:04:48 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-08-06 13:04:48 +0000 |
commit | c37de5e19480bf36c5c7a08f94aca61e472cab4f (patch) | |
tree | 2b28718a9895d171b3c82da18361e44bbb746307 | |
parent | 665507aac2175834c4c82aa6c123eeb45e5095ae (diff) | |
download | ffmpeg-c37de5e19480bf36c5c7a08f94aca61e472cab4f.tar.gz |
Make MPEG-4 encoder depend on H.263 encoder in configure.
Originally committed as revision 19600 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | libavcodec/Makefile | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -1087,7 +1087,7 @@ loco_decoder_select="golomb" mjpeg_encoder_select="aandct" mpeg1video_encoder_select="aandct" mpeg2video_encoder_select="aandct" -mpeg4_encoder_select="aandct" +mpeg4_encoder_select="h263_encoder" mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" mpeg1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index af2e5e60a6..0cae8efabe 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -146,7 +146,6 @@ OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG4_DECODER) += h263dec.o h263.o mpeg4video_parser.o mpegvideo.o error_resilience.o -OBJS-$(CONFIG_MPEG4_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o |