summaryrefslogtreecommitdiff
path: root/libavcodec/vc1.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2008-11-16 06:47:44 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2008-11-16 06:47:44 +0000
commit55374d57e88ae9c74840732a7eb055b512e94966 (patch)
tree7f71cd14abfde02bfa76f63df7f65fb6290b4d62 /libavcodec/vc1.c
parentebd610557e26d9c41e86bf357e8395e019d7db9b (diff)
421l: postproc flag may be present in any VC-1 AP frame type
Originally committed as revision 15842 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vc1.c')
-rw-r--r--libavcodec/vc1.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 375c20ac2c..3d9a10bd68 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1394,6 +1394,8 @@ static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
else v->halfpq = 0;
if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
v->pquantizer = get_bits1(gb);
+ if(v->postprocflag)
+ v->postproc = get_bits1(gb);
if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_P_TYPE) v->use_ic = 0;
@@ -1416,8 +1418,6 @@ static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
}
break;
case FF_P_TYPE:
- if(v->postprocflag)
- v->postproc = get_bits1(gb);
if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3);
else v->mvrange = 0;
v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13
@@ -1507,8 +1507,6 @@ static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
}
break;
case FF_B_TYPE:
- if(v->postprocflag)
- v->postproc = get_bits1(gb);
if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3);
else v->mvrange = 0;
v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13