From 617e42e2c49878f8694a5c870f3451d21354d5ab Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 23 Jul 2008 14:37:15 +0000 Subject: [PATCH] Simplify cross_idr calculation. Originally committed as revision 14349 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0ce07d7..78cc329 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7896,11 +7896,6 @@ static int decode_frame(AVCodecContext *avctx, 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 *avctx, 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; -- 2.7.4