[SCM] libav/experimental: H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org ) With this patch, the streams CAWP5_TOSHIBA_E.264 and CVWP5_TOSHIBA_E.264 are completely decoded

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0d315f281c4bbdb59a7395985d9d89a9395928c0
Author: Loïc Le Loarer <lll+ffmpeg at m4x.org>
Date:   Tue Feb 1 11:26:11 2005 +0000

    H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
    With this patch, the streams CAWP5_TOSHIBA_E.264 and CVWP5_TOSHIBA_E.264
    are completely decoded
    
    Originally committed as revision 3917 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index dbedcb4..28cb778 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3010,25 +3010,28 @@ static int decode_ref_pic_list_reordering(H264Context *h){
                         else                                pred+= abs_diff_pic_num;
                         pred &= h->max_pic_num - 1;
                     
-                        for(i= h->ref_count[list]-1; i>=index; i--){
-                            if(h->ref_list[list][i].pic_id == pred && h->ref_list[list][i].long_ref==0)
+                        for(i= h->ref_count[list]-1; i>=0; i--){
+                            if(h->ref_list[list][i].data[0] != NULL && h->ref_list[list][i].pic_id == pred && h->ref_list[list][i].long_ref==0) // ignore non existing pictures by testing data[0] pointer
                                 break;
                         }
                     }else{
                         pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
 
-                        for(i= h->ref_count[list]-1; i>=index; i--){
-                            if(h->ref_list[list][i].pic_id == pic_id && h->ref_list[list][i].long_ref==1)
+                        for(i= h->ref_count[list]-1; i>=0; i--){
+                            if(h->ref_list[list][i].pic_id == pic_id && h->ref_list[list][i].long_ref==1) // no need to ignore non existing pictures as non existing pictures have long_ref==0
                                 break;
                         }
                     }
 
-                    if(i < index){
+                    if (i < 0) {
                         av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
                         memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
-                    }else if(i > index){
+                    } else if (i != index) /* this test is not necessary, it is only an optimisation to skip double copy of Picture structure in this case */ {
                         Picture tmp= h->ref_list[list][i];
-                        for(; i>index; i--){
+                        if (i < index) {
+                            i = h->ref_count[list];
+                        }
+                        for(; i > index; i--){
                             h->ref_list[list][i]= h->ref_list[list][i-1];
                         }
                         h->ref_list[list][index]= tmp;

-- 
Libav/FFmpeg packaging