diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-07-19 11:57:29 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-07-19 11:57:29 +0000 |
| commit | 801b27fa7cc2d97d6afdc2b899b520288f240299 (patch) | |
| tree | b9a40d54a4fea79c00f2937514f1c95069c627d2 /libavcodec/h264.c | |
| parent | 3eaa6d0e56696e2735a27accf1e7459b1acd9a19 (diff) | |
| download | ffmpeg-801b27fa7cc2d97d6afdc2b899b520288f240299.tar.gz | |
Remove apparently unneeded out!=NULL check.
Originally committed as revision 14299 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7e2b0581b3..6445b1c2ce 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7856,7 +7856,7 @@ static int decode_frame(AVCodecContext *avctx, { } else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) || (s->low_delay && - ((!cross_idr && out && out->poc > h->outputed_poc + 2) + ((!cross_idr && out->poc > h->outputed_poc + 2) || cur->pict_type == FF_B_TYPE))) { s->low_delay = 0; |