diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2005-10-27 21:03:36 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2005-10-27 21:03:36 +0000 |
| commit | cd19c677cb5dcaecc472c021bd38370817740a5e (patch) | |
| tree | 8f1d3874402e1f4c81f62799fb2baa30f73da494 /libavcodec | |
| parent | a6624e21cbf9d943583c920666c0e40d3252ff4b (diff) | |
fix a crash on dropped frames
Originally committed as revision 4667 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -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 560782df7d..08687dc1aa 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7672,7 +7672,7 @@ static int decode_frame(AVCodecContext *avctx, out_of_order = !cross_idr && prev && out->poc < prev->poc; if(prev && pics <= s->avctx->has_b_frames) out = prev; - else if((out_of_order && pics-1 == s->avctx->has_b_frames) + else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) || (s->low_delay && ((!cross_idr && prev && out->poc > prev->poc + 2) || cur->pict_type == B_TYPE))) |