[FFmpeg-cvslog] r19532 - trunk/libavcodec/vc1dec.c

[diego]

Author: diego
Date: Wed Jul 29 11:54:00 2009
New Revision: 19532

Log:
Do not check for both CONFIG_VC1_VDPAU_DECODER and CONFIG_WMV3_VDPAU_DECODER,
the former depends upon the latter.

Modified:
   trunk/libavcodec/vc1dec.c

Modified: trunk/libavcodec/vc1dec.c
==============================================================================
--- trunk/libavcodec/vc1dec.c	Wed Jul 29 11:51:51 2009	(r19531)
+++ trunk/libavcodec/vc1dec.c	Wed Jul 29 11:54:00 2009	(r19532)
@@ -3256,7 +3256,7 @@ static int vc1_decode_frame(AVCodecConte
     s->me.qpel_put= s->dsp.put_qpel_pixels_tab;
     s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab;
 
-    if ((CONFIG_VC1_VDPAU_DECODER || CONFIG_WMV3_VDPAU_DECODER)
+    if ((CONFIG_VC1_VDPAU_DECODER)
         &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
         ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start);
     else if (avctx->hwaccel) {