virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vc1: Always reset numref when parsing a new frame header.

Browse Source 
Fixes an issue where the B-frame coding mode switches from interlaced
fields to interlaced frames, causing incorrect decisions in the motion
compensation code and resulting in visual artifacts.

CC: libav-stable@libav.org
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
This commit is contained in:
Michael Niedermayer 2014-01-19 15:28:25 +00:00 committed by Tim Walker
parent 89564be444
commit dd2d0039b6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vc1.c
View File

@ -842,6 +842,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */ int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */
int field_mode, fcm; int field_mode, fcm;
v->numref = 0;
v->p_frame_skipped = 0; v->p_frame_skipped = 0;
if (v->second_field) { if (v->second_field) {
v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
@ -1011,8 +1012,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
v->reffield = get_bits1(gb); v->reffield = get_bits1(gb);
v->ref_field_type[0] = v->reffield ^ !v->cur_field_type; v->ref_field_type[0] = v->reffield ^ !v->cur_field_type;
} }
} else {
v->numref = 0;
} }
if (v->extended_mv) if (v->extended_mv)
v->mvrange = get_unary(gb, 0, 3); v->mvrange = get_unary(gb, 0, 3);