diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-15 23:33:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-16 00:28:36 +0100 |
| commit | d7599bd8e240b923486bd130a33d38f66bb14eae (patch) | |
| tree | 09781f81298f7d5443438c29e518d947ab1eaf94 | |
| parent | c16f768d73cc9bd8fa2cc146dd139b1de5b4d97b (diff) | |
| download | ffmpeg-d7599bd8e240b923486bd130a33d38f66bb14eae.tar.gz | |
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>
| -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 1fd1f38d58..60a25a1ef7 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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)) { 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", |