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

vc1: don't read the interpfrm and bfraction elements for interlaced frames

Browse Source 
This matches the spec as well as the reference decoder, and fixes a bug
with interlaced frame decoding.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
This commit is contained in:
Hendrik Leppkes
2012-01-13 18:41:21 +01:00
committed by Kostya Shishkov
parent 50a3f9a4bd
commit 7662a532fb
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vc1.c
View File

@@ -911,6 +911,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
} }
goto parse_common_info; goto parse_common_info;
} }
if (v->fcm == PROGRESSIVE) {
if (v->finterpflag) if (v->finterpflag)
v->interpfrm = get_bits1(gb); v->interpfrm = get_bits1(gb);
if (v->s.pict_type == AV_PICTURE_TYPE_B) { if (v->s.pict_type == AV_PICTURE_TYPE_B) {
@@ -920,6 +921,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
v->s.pict_type = AV_PICTURE_TYPE_BI; /* XXX: should not happen here */ v->s.pict_type = AV_PICTURE_TYPE_BI; /* XXX: should not happen here */
} }
} }
}
parse_common_info: parse_common_info:
if (v->field_mode) if (v->field_mode)