|
|
|
@ -6007,14 +6007,14 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, |
|
|
|
|
s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab; |
|
|
|
|
|
|
|
|
|
if ((CONFIG_VC1_VDPAU_DECODER) |
|
|
|
|
&&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) |
|
|
|
|
&&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) { |
|
|
|
|
if (v->field_mode && buf_start_second_field) { |
|
|
|
|
ff_vdpau_vc1_decode_picture(s, buf_start, buf_start_second_field - buf_start); |
|
|
|
|
ff_vdpau_vc1_decode_picture(s, buf_start_second_field, (buf + buf_size) - buf_start_second_field); |
|
|
|
|
} else { |
|
|
|
|
ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start); |
|
|
|
|
ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start); |
|
|
|
|
} |
|
|
|
|
else if (avctx->hwaccel) { |
|
|
|
|
} else if (avctx->hwaccel) { |
|
|
|
|
if (v->field_mode && buf_start_second_field) { |
|
|
|
|
// decode first field
|
|
|
|
|
s->picture_structure = PICT_BOTTOM_FIELD - v->tff; |
|
|
|
|