Mercurial > libavcodec.hg

changeset 7381:16a60b2f7a7d libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor simplification of code in init_poc().
author michael
date Thu, 24 Jul 2008 22:29:38 +0000
parents 9faeb82ba80b
children f9e70983fc35
files h264.c
diffstat 1 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Thu Jul 24 22:05:58 2008 +0000
+++ b/h264.c	Thu Jul 24 22:29:38 2008 +0000
@@ -3699,10 +3699,9 @@
     const int max_frame_num= 1<<h->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<<h->sps.log2_max_poc_lsb;
@@ -3753,10 +3752,10 @@
         if(s->picture_structure == PICT_FRAME)
             field_poc[1] += h->delta_poc[1];
     }else{
-        int poc;
-
-        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;
+        int poc= 2*(h->frame_num_offset + h->frame_num);
+
+        if(!h->nal_ref_idc)
+            poc--;
 
         field_poc[0]= poc;
         field_poc[1]= poc;