Set VDPAU H264 picture parameter field_order_cnt and frame_num at the

start of decoding a picture instead of at the end.
Fixes mmco01.264

Patch by Stephen Warren

Originally committed as revision 22728 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stephen Warren
2010-03-30 08:10:29 +00:00
committed by Carl Eugen Hoyos
parent e5efbafdfd
commit 3bccd93ac0
3 changed files with 21 additions and 8 deletions

View File

@@ -2577,9 +2577,11 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
avctx->profile = hx->sps.profile_idc;
avctx->level = hx->sps.level_idc;
if (s->avctx->hwaccel && h->current_slice == 1) {
if (s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
if (h->current_slice == 1) {
if (s->avctx->hwaccel && s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
return -1;
if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_h264_picture_start(s);
}
s->current_picture_ptr->key_frame |=