H.264: move avctx->refs init before AVCodecContext.get_format().
authorGwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Thu, 15 Apr 2010 08:27:06 +0000 (08:27 +0000)
committerGwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Thu, 15 Apr 2010 08:27:06 +0000 (08:27 +0000)
Originally committed as revision 22883 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.c

index faa7447..59e6448 100644 (file)
@@ -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,