Mercurial > libavcodec.hg
comparison h264.c @ 11555:e603f624b03f libavcodec
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
author | cehoyos |
---|---|
date | Tue, 30 Mar 2010 08:10:29 +0000 |
parents | e9640e8aeea3 |
children | 44c5c540722c |
comparison
equal
deleted
inserted
replaced
11554:30f5bf824f04 | 11555:e603f624b03f |
---|---|
2575 break; | 2575 break; |
2576 | 2576 |
2577 avctx->profile = hx->sps.profile_idc; | 2577 avctx->profile = hx->sps.profile_idc; |
2578 avctx->level = hx->sps.level_idc; | 2578 avctx->level = hx->sps.level_idc; |
2579 | 2579 |
2580 if (s->avctx->hwaccel && h->current_slice == 1) { | 2580 if (h->current_slice == 1) { |
2581 if (s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0) | 2581 if (s->avctx->hwaccel && s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0) |
2582 return -1; | 2582 return -1; |
2583 if(CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) | |
2584 ff_vdpau_h264_picture_start(s); | |
2583 } | 2585 } |
2584 | 2586 |
2585 s->current_picture_ptr->key_frame |= | 2587 s->current_picture_ptr->key_frame |= |
2586 (hx->nal_unit_type == NAL_IDR_SLICE) || | 2588 (hx->nal_unit_type == NAL_IDR_SLICE) || |
2587 (h->sei_recovery_frame_cnt >= 0); | 2589 (h->sei_recovery_frame_cnt >= 0); |