mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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
This commit is contained in:
parent
fe3608d577
commit
e0f58e39c4
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user