# HG changeset patch
# User cehoyos
# Date 1245503767 0
# Node ID c4ef915fbefab17dba100e060c1fb5ac46518ddf
# Parent  ee966d1064a2708555091ccc264c0471c6bb23b7
Fix H.264 picture reordering.

Patch by Haruhiko Yamagata, h D yamagata A nifty D com

diff -r ee966d1064a2 -r c4ef915fbefa h264.c
--- a/h264.c	Sat Jun 20 13:10:17 2009 +0000
+++ b/h264.c	Sat Jun 20 13:16:07 2009 +0000
@@ -7708,7 +7708,7 @@
 //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 @@
 
             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;