diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-07-23 14:37:15 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-07-23 14:37:15 +0000 |
| commit | 617e42e2c49878f8694a5c870f3451d21354d5ab (patch) | |
| tree | f3dd552907c1d2d7f1553dc05803d994b83dc268 | |
| parent | 20455a335be342873153d1b67e9604e3b011eb8d (diff) | |
| download | ffmpeg-617e42e2c49878f8694a5c870f3451d21354d5ab.tar.gz | |
Simplify cross_idr calculation.
Originally committed as revision 14349 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0ce07d7dcb..78cc3298fa 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; |