[FFmpeg-cvslog] r14349 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Wed Jul 23 16:37:15 2008
New Revision: 14349

Log:
Simplify cross_idr calculation.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Wed Jul 23 16:37:15 2008
@@ -7896,11 +7896,6 @@ static int decode_frame(AVCodecContext *
             if(cur->reference == 0)
                 cur->reference = DELAYED_PIC_REF;
 
-            cross_idr = 0;
-            for(i=0; h->delayed_pic[i]; i++)
-                if(h->delayed_pic[i]->poc==0)
-                    cross_idr = 1;
-
             out = h->delayed_pic[0];
             out_idx = 0;
             for(i=1; h->delayed_pic[i] && h->delayed_pic[i]->poc; i++)
@@ -7908,6 +7903,7 @@ static int decode_frame(AVCodecContext *
                     out = h->delayed_pic[i];
                     out_idx = i;
                 }
+            cross_idr = !h->delayed_pic[0]->poc || !h->delayed_pic[i];
 
             out_of_order = !cross_idr && out->poc < h->outputed_poc;