aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-26 12:01:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-26 12:23:39 +0100
commit0290a646ac662a8552dfdb2de4887cac7a79acd1 (patch)
tree865482572fcbbfc291349b8aa651143a60173779
parent8bf7ea8ac2104525e60cfd68097deb23430a0155 (diff)
parentde44dfc7c0ec02bda7d846ef713145c890bfae3f (diff)
downloadffmpeg-0290a646ac662a8552dfdb2de4887cac7a79acd1.tar.gz
Merge commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f'
* commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f': vc1: Reset numref if fieldmode is not set This change is redundant, numref is already reset Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vc1.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index f7558116d1..7a3331bc0c 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1021,6 +1021,8 @@ 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);