# HG changeset patch # User michael # Date 1220373078 0 # Node ID 834a8f89b75ee4eae0e0040e02c7bb3d75e3e8a4 # Parent 58fdf1638bc4602ec8ed42c184e11e0c9566d417 Try to support invalid h264 that does not mark IDR with POC=0. Fixes issue576. diff -r 58fdf1638bc4 -r 834a8f89b75e h264.c --- a/h264.c Tue Sep 02 04:04:26 2008 +0000 +++ b/h264.c Tue Sep 02 16:31:18 2008 +0000 @@ -7488,7 +7488,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; i++) + for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++) if(h->delayed_pic[i]->poc < out->poc){ out = h->delayed_pic[i]; out_idx = i; @@ -7632,12 +7632,12 @@ out = h->delayed_pic[0]; out_idx = 0; - for(i=1; h->delayed_pic[i] && h->delayed_pic[i]->poc; i++) + for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !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]; + cross_idr = !h->delayed_pic[0]->poc || !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame; out_of_order = !cross_idr && out->poc < h->outputed_poc;