[SCM] libav/experimental: Fix H.264 picture reordering.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6ee0eb38c015d7bf139b0058e4d28244830d9d01
Author: Haruhiko Yamagata <h.yamagata at nifty.com>
Date:   Sat Jun 20 13:16:07 2009 +0000

    Fix H.264 picture reordering.
    
    Patch by Haruhiko Yamagata, h D yamagata A nifty D com
    
    Originally committed as revision 19239 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 55553ed..23d5b10 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7708,7 +7708,7 @@ static int decode_frame(AVCodecContext *avctx,
 //FIXME factorize this with the output code below
         out = h->delayed_pic[0];
         out_idx = 0;
-        for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++)
+        for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
             if(h->delayed_pic[i]->poc < out->poc){
                 out = h->delayed_pic[i];
                 out_idx = i;
@@ -7884,12 +7884,12 @@ static int decode_frame(AVCodecContext *avctx,
 
             out = h->delayed_pic[0];
             out_idx = 0;
-            for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++)
+            for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
                 if(h->delayed_pic[i]->poc < out->poc){
                     out = h->delayed_pic[i];
                     out_idx = i;
                 }
-            cross_idr = !h->delayed_pic[0]->poc || !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame;
+            cross_idr = !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame;
 
             out_of_order = !cross_idr && out->poc < h->outputed_poc;
 

-- 
Libav/FFmpeg packaging