diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-08-02 14:47:26 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-02 14:47:26 +0000 |
| commit | 4d8eecf4751ab0c011bc3ea7981a8bfe3fcff6ae (patch) | |
| tree | 4db1f565abb0bf8639f9b6a28410ff9cbbe004cb | |
| parent | b25a881851fb5d626feca27a6a028c733b43e459 (diff) | |
Make XVMC mpegvideo decoder depend on mpegvideo decoder.
It makes no sense to enable the former without the latter.
Originally committed as revision 19565 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1097,6 +1097,7 @@ mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" 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" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a73c0fc380..c549d20561 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -140,7 +140,7 @@ OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mp OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o -OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o |