|
|
@ -1777,6 +1777,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ |
|
|
|
} |
|
|
|
} |
|
|
|
h->sps = *h0->sps_buffers[h->pps.sps_id]; |
|
|
|
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){ |
|
|
|
if(h == h0 && h->dequant_coeff_pps != pps_id){ |
|
|
|
h->dequant_coeff_pps = pps_id; |
|
|
|
h->dequant_coeff_pps = pps_id; |
|
|
|
init_dequant_tables(h); |
|
|
|
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_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; |
|
|
|
h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width; |
|
|
|
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){ |
|
|
|
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", |
|
|
|
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, |
|
|
|
h->slice_num, |
|
|
|