[FFmpeg-cvslog] h264: Reset last_pocs in case of reference or frame number inconsistencies

[Michael Niedermayer]

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 22:36:07 2013 +0100| [169d84934423c91b321c83703bd0be660c0d25da] | committer: Carl Eugen Hoyos

h264: Reset last_pocs in case of reference or frame number inconsistencies

This prevents faulty increasing of has_b_frames
Should fix Ticket 2062

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c230af9bccc3cadb373f9007ba14fffb6c2acc75)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=169d84934423c91b321c83703bd0be660c0d25da
---

 libavcodec/h264.c      |    3 +++
 libavcodec/h264_refs.c |    3 +++
 2 files changed, 6 insertions(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index cd7dc5a..3249baa 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2788,6 +2788,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
             Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL;
             av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n",
                    h->frame_num, h->prev_frame_num);
+            if (!h->sps.gaps_in_frame_num_allowed_flag)
+                for(i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++)
+                    h->last_pocs[i] = INT_MIN;
             if (ff_h264_frame_start(h) < 0)
                 return -1;
             h->prev_frame_num++;
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 3e0f39d..d72c498 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -287,7 +287,10 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
     for(list=0; list<h->list_count; list++){
         for(index= 0; index < h->ref_count[list]; index++){
             if (!h->ref_list[list][index].f.data[0]) {
+                int i;
                 av_log(h->s.avctx, AV_LOG_ERROR, "Missing reference picture, default is %d\n", h->default_ref_list[list][0].poc);
+                for (i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++)
+                    h->last_pocs[i] = INT_MIN;
                 if (h->default_ref_list[list][0].f.data[0])
                     h->ref_list[list][index]= h->default_ref_list[list][0];
                 else