diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2010-04-15 08:27:06 +0000 |
|---|---|---|
| committer | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2010-04-15 08:27:06 +0000 |
| commit | b08e38e8c3faf092155b2ed7772c5392712cb473 (patch) | |
| tree | 630b48daabb6a3d8b28c61c4e1f3aafb4e091025 /libavcodec/h264.c | |
| parent | 67d96fb42d01d4ed5fe6f88b080b53606341beb4 (diff) | |
| download | ffmpeg-b08e38e8c3faf092155b2ed7772c5392712cb473.tar.gz | |
H.264: move avctx->refs init before AVCodecContext.get_format().
Originally committed as revision 22883 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index faa7447a96..59e644884f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1777,6 +1777,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ } h->sps = *h0->sps_buffers[h->pps.sps_id]; + s->avctx->refs= h->sps.ref_frame_count; + if(h == h0 && h->dequant_coeff_pps != pps_id){ h->dequant_coeff_pps = pps_id; init_dequant_tables(h); @@ -2172,8 +2174,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width; - s->avctx->refs= h->sps.ref_frame_count; - if(s->avctx->debug&FF_DEBUG_PICT_INFO){ av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", h->slice_num, |