diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-05 03:15:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-05 03:21:47 +0200 |
| commit | f7da257a897684415c23a472b068febade7c2aca (patch) | |
| tree | fe5dcf406322bccaae8599190efa35a2e2691574 | |
| parent | f108b335687028663105a6cb6ee9afaabda78b9f (diff) | |
| download | ffmpeg-f7da257a897684415c23a472b068febade7c2aca.tar.gz | |
h264: remove assert() on ref_frame_count.
This assert can fail if a SPS with a smaller value becomes active.
Fixes Ticket532
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_refs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 20c75d089d..0e00c4f94b 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -479,10 +479,9 @@ static void print_long_term(H264Context *h) { void ff_generate_sliding_window_mmcos(H264Context *h) { MpegEncContext * const s = &h->s; - av_assert0(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); h->mmco_index= 0; - if(h->short_ref_count && h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count && + if(h->short_ref_count && h->long_ref_count + h->short_ref_count >= h->sps.ref_frame_count && !(FIELD_PICTURE && !s->first_field && s->current_picture_ptr->f.reference)) { h->mmco[0].opcode= MMCO_SHORT2UNUSED; h->mmco[0].short_pic_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; |