aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2007-02-04 10:46:28 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-02-04 10:46:28 +0000
commit93731ff27d0a744a034655c851b9d1bc30231053 (patch)
tree4c8141b1cb546962af1b708b5b1f41e00a320bfd
parentf0c31621c6a77093659f8fe5cef67a732621ec77 (diff)
downloadffmpeg-93731ff27d0a744a034655c851b9d1bc30231053.tar.gz
Save frame header info in context variables
Originally committed as revision 7815 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vc1.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 8c69808725..e0bd62e63f 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1616,14 +1616,13 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
{
- int fcm;
int pqindex, lowquant;
int status;
v->p_frame_skipped = 0;
if(v->interlace)
- fcm = decode012(gb);
+ v->fcm = decode012(gb);
switch(get_prefix(gb, 0, 4)) {
case 0:
v->s.pict_type = P_TYPE;
@@ -1646,10 +1645,10 @@ static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
get_bits(gb, 8);
if(v->broadcast) {
if(!v->interlace || v->panscanflag) {
- get_bits(gb, 2);
+ v->rptfrm = get_bits(gb, 2);
} else {
- get_bits1(gb);
- get_bits1(gb);
+ v->tff = get_bits1(gb);
+ v->rptfrm = get_bits1(gb);
}
}
if(v->panscanflag) {