opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-02 05:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a crash on dropped frames

Browse Source 
Originally committed as revision 4667 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Loren Merritt
2005-10-27 21:03:36 +00:00
parent a6624e21cb
commit cd19c677cb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -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)))