diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 15:28:25 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-02-01 23:51:46 -0500 |
| commit | 3cc8d9bc1ffc6c0888960fb009f12fa3047bb663 (patch) | |
| tree | 04744040c432150ecfeede3bd8a37334067356bf /libavcodec | |
| parent | 299c5dcfb0cd3debdf07943edfb46f4aeb02ca91 (diff) | |
| download | ffmpeg-3cc8d9bc1ffc6c0888960fb009f12fa3047bb663.tar.gz | |
vc1: Always reset numref when parsing a new frame header.
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>
(cherry picked from commit dd2d0039b6405dc724e4fef0d5b8f49530eea3aa)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 21449bdb6d..d2e1e69b20 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -826,6 +826,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */ int scale, shift, i; /* for initializing LUT for intensity compensation */ + v->numref = 0; v->p_frame_skipped = 0; if (v->second_field) { v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; @@ -992,8 +993,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) v->reffield = get_bits1(gb); v->ref_field_type[0] = v->reffield ^ !v->cur_field_type; } - } else { - v->numref = 0; } if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3); |