# HG changeset patch # User michael # Date 1216823835 0 # Node ID 2f9d5f6b8fffc5d61955dbbf1f86fb24461525eb # Parent 5a743d9ad9bc8b90f1d4a8a883aa4e0e3f2bb857 Simplify cross_idr calculation. diff -r 5a743d9ad9bc -r 2f9d5f6b8fff h264.c --- a/h264.c Wed Jul 23 12:21:56 2008 +0000 +++ b/h264.c Wed Jul 23 14:37:15 2008 +0000 @@ -7896,11 +7896,6 @@ 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 @@ 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;