RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264: dont mess with frame gaps on second fields. 

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-15 23:33:20 +01:00
parent c16f768d73
commit d7599bd8e2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -2834,7 +2834,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
} }
} }
while (h->frame_num != h->prev_frame_num && h->prev_frame_num >= 0 && while (h->frame_num != h->prev_frame_num && h->prev_frame_num >= 0 && !s0->first_field &&
h->frame_num != (h->prev_frame_num + 1) % (1 << h->sps.log2_max_frame_num)) { h->frame_num != (h->prev_frame_num + 1) % (1 << h->sps.log2_max_frame_num)) {
Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL; Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL;
av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n",