From b78a6baaf1e25f93cae070526448d5246b31a334 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 24 Jul 2008 22:29:38 +0000 Subject: [PATCH] Minor simplification of code in init_poc(). Originally committed as revision 14379 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 437a605..209c6ec 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3699,10 +3699,9 @@ static int init_poc(H264Context *h){ const int max_frame_num= 1<sps.log2_max_frame_num; int field_poc[2]; + h->frame_num_offset= h->prev_frame_num_offset; if(h->frame_num < h->prev_frame_num) - h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; - else - h->frame_num_offset= h->prev_frame_num_offset; + h->frame_num_offset += max_frame_num; if(h->sps.poc_type==0){ const int max_poc_lsb= 1<sps.log2_max_poc_lsb; @@ -3753,10 +3752,10 @@ static int init_poc(H264Context *h){ if(s->picture_structure == PICT_FRAME) field_poc[1] += h->delta_poc[1]; }else{ - int poc; + int poc= 2*(h->frame_num_offset + h->frame_num); - if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); - else poc= 2*(h->frame_num_offset + h->frame_num) - 1; + if(!h->nal_ref_idc) + poc--; field_poc[0]= poc; field_poc[1]= poc; -- 2.7.4