From e0f58e39c45abf4fd830f745d31acc43183ac7e6 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 29 Jul 2009 09:54:00 +0000 Subject: Do not check for both CONFIG_VC1_VDPAU_DECODER and CONFIG_WMV3_VDPAU_DECODER, the former depends upon the latter. Originally committed as revision 19532 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/vc1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 96055e664c..ad4125de8f 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -3256,7 +3256,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, 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) { -- cgit v1.2.3