generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-11-26 12:01:55 +01:00
commit 0290a646ac
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vc1.c
View File

@ -1021,6 +1021,8 @@ 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);