[SCM] libav/experimental: h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0bc42caddf454a075fad76053c2e9bc2a5a4563a
Author: Loren Merritt <lorenm at u.washington.edu>
Date:   Sun Oct 3 22:01:21 2004 +0000

    h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
    
    Originally committed as revision 3558 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c36e384..108042e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2592,6 +2592,8 @@ static int decode_ref_pic_list_reordering(H264Context *h){
                 int pic_id;
                 int i;
                 
+                if(reordering_of_pic_nums_idc==3) 
+                    break;
                 
                 if(index >= h->ref_count[list]){
                     av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
@@ -2634,9 +2636,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){
                         }
                         h->ref_list[list][index]= tmp;
                     }
-                }else if(reordering_of_pic_nums_idc==3) 
-                    break;
-                else{
+                }else{
                     av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
                     return -1;
                 }

-- 
Libav/FFmpeg packaging