Skip to content

F
ffmpeg-mt
Commit f2cc6194 authored by lorenm's avatar lorenm
Browse files
Options

fix a crash on dropped frames 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4667 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f9f93b79
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
libavcodec/h264.c
View file @ f2cc6194
...@@ -7672,7 +7672,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -7672,7 +7672,7 @@ static int decode_frame(AVCodecContext *avctx,
out_of_order = !cross_idr && prev && out->poc < prev->poc; out_of_order = !cross_idr && prev && out->poc < prev->poc;
if(prev && pics <= s->avctx->has_b_frames) if(prev && pics <= s->avctx->has_b_frames)
out = prev; 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 && || (s->low_delay &&
((!cross_idr && prev && out->poc > prev->poc + 2) ((!cross_idr && prev && out->poc > prev->poc + 2)
|| cur->pict_type == B_TYPE))) || cur->pict_type == B_TYPE)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment