Fix poc for field pictures. Prior to this, the poc of the second field
authorJeff Downs <heydowns@borg.com>
Tue, 6 Nov 2007 18:48:18 +0000 (18:48 +0000)
committerJeff Downs <heydowns@borg.com>
Tue, 6 Nov 2007 18:48:18 +0000 (18:48 +0000)
in decoding order would always be assigned to a field pair's poc.

Original thread: H.264: Fix poc for field pairs, 6 Nov 2007 17:41:02

Originally committed as revision 10937 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.c

index ec0cdcb..2be6753 100644 (file)
@@ -3767,8 +3767,10 @@ static int init_poc(H264Context *h){
         s->current_picture_ptr->field_poc[1]= field_poc[1];
         s->current_picture_ptr->poc = field_poc[1];
     }
         s->current_picture_ptr->field_poc[1]= field_poc[1];
         s->current_picture_ptr->poc = field_poc[1];
     }
-    if(!FIELD_PICTURE || !s->first_field)
-        s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]);
+    if(!FIELD_PICTURE || !s->first_field) {
+        Picture *cur = s->current_picture_ptr;
+        cur->poc= FFMIN(cur->field_poc[0], cur->field_poc[1]);
+    }
 
     return 0;
 }
 
     return 0;
 }