aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-21 04:26:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-21 04:29:59 +0100
commita459891e624c7b7670f888498df9c137b6ad6111 (patch)
treed4161af5065be35651a8cd15d797dd2d6e128a88
parent1c7d2870440fcf3c11dadb8b060cc8ee0ffeafc5 (diff)
parentdd2d0039b6405dc724e4fef0d5b8f49530eea3aa (diff)
downloadffmpeg-a459891e624c7b7670f888498df9c137b6ad6111.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vc1: Always reset numref when parsing a new frame header. Conflicts: libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vc1.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index f8d3162efb..258b518dd5 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -837,7 +837,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */
int field_mode, fcm;
- v->numref=0;
+ v->numref = 0;
v->p_frame_skipped = 0;
if (v->second_field) {
if(v->fcm!=2 || v->field_mode!=1)
@@ -1016,8 +1016,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);