Mercurial > libavcodec.hg

comparison vc1dec.c @ 9994:cd2b3ecdb1c9 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c69559e9f6c3
children 38a57d201569
comparison
equal deleted inserted replaced
9993:94107f128f64 9994:cd2b3ecdb1c9
3254 } 3254 }
3255 3255
3256 s->me.qpel_put= s->dsp.put_qpel_pixels_tab; 3256 s->me.qpel_put= s->dsp.put_qpel_pixels_tab;
3257 s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab; 3257 s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab;
3258 3258
3259 if ((CONFIG_VC1_VDPAU_DECODER || CONFIG_WMV3_VDPAU_DECODER) 3259 if ((CONFIG_VC1_VDPAU_DECODER)
3260 &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) 3260 &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
3261 ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start); 3261 ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start);
3262 else if (avctx->hwaccel) { 3262 else if (avctx->hwaccel) {
3263 if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0) 3263 if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0)
3264 return -1; 3264 return -1;