diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-08-05 13:02:04 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-05 13:02:04 +0000 |
| commit | 4e169d89f3f5c183f4747b2963466e83c3af8bba (patch) | |
| tree | 10b250f4c88a7d1c3f8e14bb50bdedeac9050061 | |
| parent | 735e36a3e4427b009f27d27baa7541f686c180d4 (diff) | |
Declare the dependencies of the MSMPEG4v1/MSMPEG4v2/MSMPEG4v3 encoders on the
H.263 encoder in configure.
Originally committed as revision 19594 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavcodec/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -1098,9 +1098,9 @@ mpeg4_vaapi_hwaccel_deps="va_va_h" mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" mpeg_xvmc_decoder_select="mpegvideo_decoder" -msmpeg4v1_encoder_select="aandct" -msmpeg4v2_encoder_select="aandct" -msmpeg4v3_encoder_select="aandct" +msmpeg4v1_encoder_select="h263_encoder" +msmpeg4v2_encoder_select="h263_encoder" +msmpeg4v3_encoder_select="h263_encoder" nellymoser_decoder_select="fft mdct" nellymoser_encoder_select="fft mdct" png_decoder_select="zlib" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 27aca0c0f7..2807c74d88 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -151,11 +151,11 @@ OBJS-$(CONFIG_MPEG4_DECODER) += h263dec.o h263.o mpeg4video_parser.o m 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 mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpegvideo.o error_resilience.o -OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpegvideo.o error_resilience.o -OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o |