[FFmpeg-cvslog] r19565 - in trunk: configure libavcodec/Makefile

[diego]

Author: diego
Date: Sun Aug  2 16:47:26 2009
New Revision: 19565

Log:
Make XVMC mpegvideo decoder depend on mpegvideo decoder.
It makes no sense to enable the former without the latter.

Modified:
   trunk/configure
   trunk/libavcodec/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Aug  2 15:35:42 2009	(r19564)
+++ trunk/configure	Sun Aug  2 16:47:26 2009	(r19565)
@@ -1097,6 +1097,7 @@ mpeg2_vaapi_hwaccel_select="vaapi mpeg2v
 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"

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sun Aug  2 15:35:42 2009	(r19564)
+++ trunk/libavcodec/Makefile	Sun Aug  2 16:47:26 2009	(r19565)
@@ -140,7 +140,7 @@ OBJS-$(CONFIG_MP3ON4_DECODER)          +
 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