# HG changeset patch
# User diego
# Date 1248861240 0
# Node ID cd2b3ecdb1c97b22b4ee15341d0ebfcebff12bba
# Parent  94107f128f6490fe36c73dd6510593cdf7eb4afe
Do not check for both CONFIG_VC1_VDPAU_DECODER and CONFIG_WMV3_VDPAU_DECODER,
the former depends upon the latter.

diff -r 94107f128f64 -r cd2b3ecdb1c9 vc1dec.c
--- a/vc1dec.c	Wed Jul 29 09:51:51 2009 +0000
+++ b/vc1dec.c	Wed Jul 29 09:54:00 2009 +0000
@@ -3256,7 +3256,7 @@
     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) {