Mercurial > libavcodec.hg
changeset 9994:cd2b3ecdb1c9 libavcodec
Do not check for both CONFIG_VC1_VDPAU_DECODER and CONFIG_WMV3_VDPAU_DECODER,
the former depends upon the latter.
author | diego |
---|---|
date | Wed, 29 Jul 2009 09:54:00 +0000 |
parents | 94107f128f64 |
children | 3141f69e3905 |
files | vc1dec.c |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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) {