summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2009-01-23 06:33:04 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-01-23 06:33:04 +0000
commit1cae2ef9a6730863b1d68e27fa3de13afd3a0ea6 (patch)
tree77fdaa453a2964a047df26976249fb131c885bfe
parenta28d52249171fd7adb95f210a3a71cec498bf790 (diff)
Remove the block with always false condition from vc1_parse_frame_header()
Originally committed as revision 16726 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vc1.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 78b76d103e..3e33a1b8a9 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1174,12 +1174,7 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11
v->range_x = 1 << (v->k_x - 1);
v->range_y = 1 << (v->k_y - 1);
- if (v->profile == PROFILE_ADVANCED)
- {
- if (v->postprocflag) v->postproc = get_bits1(gb);
- }
- else
- if (v->multires && v->s.pict_type != FF_B_TYPE) v->respic = get_bits(gb, 2);
+ if (v->multires && v->s.pict_type != FF_B_TYPE) v->respic = get_bits(gb, 2);
if(v->res_x8 && (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)){
v->x8_type = get_bits1(gb);