aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-19 15:28:25 +0000
committerReinhard Tartler <siretart@tauware.de>2014-02-02 12:48:34 -0500
commit30c8a5e4f6c096eabb82c45177b945ebc85144fb (patch)
tree48a74436aca3ebad3ef075983abc0f0799f5aef6
parent716ee73c991cfa4a8a49670e2650ebd0e2d34df8 (diff)
downloadffmpeg-30c8a5e4f6c096eabb82c45177b945ebc85144fb.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> (cherry picked from commit 3cc8d9bc1ffc6c0888960fb009f12fa3047bb663) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavcodec/vc1.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 6135ebdc09..68e0d0d306 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -822,6 +822,7 @@ int 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;