[SCM] libav/experimental: Fix poc for field pictures. Prior to this, the poc of the second field in decoding order would always be assigned to a field pair's poc.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c0a8500015890af5478f11e130a35587e8eee731
Author: Jeff Downs <heydowns at borg.com>
Date:   Tue Nov 6 18:48:18 2007 +0000

    Fix poc for field pictures. Prior to this, the poc of the second field
    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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ec0cdcb..2be6753 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -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];
     }
-    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;
 }

-- 
Libav/FFmpeg packaging