diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-07-23 11:24:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-07-23 11:24:04 +0000 |
| commit | 55f22dd473fa954a17cef2fcf089ad7fd696d4e0 (patch) | |
| tree | 1783e26deacdfd1a727f333ec234450b0bbe8160 | |
| parent | 817a3de916d5b3199dfc0c177118a25046a898d7 (diff) | |
| download | ffmpeg-55f22dd473fa954a17cef2fcf089ad7fd696d4e0.tar.gz | |
Remove redundant keyframe checks.
Originally committed as revision 14347 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b8db9263ee..0ce07d7dcb 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7754,7 +7754,7 @@ static int decode_frame(AVCodecContext *avctx, //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]->key_frame && h->delayed_pic[i]->poc; i++) + for(i=1; h->delayed_pic[i] && h->delayed_pic[i]->poc; i++) if(h->delayed_pic[i]->poc < out->poc){ out = h->delayed_pic[i]; out_idx = i; @@ -7898,12 +7898,12 @@ static int decode_frame(AVCodecContext *avctx, cross_idr = 0; for(i=0; h->delayed_pic[i]; i++) - if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0) + 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]->key_frame && h->delayed_pic[i]->poc; i++) + for(i=1; h->delayed_pic[i] && h->delayed_pic[i]->poc; i++) if(h->delayed_pic[i]->poc < out->poc){ out = h->delayed_pic[i]; out_idx = i; |