comparison vc1.c @ 8640:ad979489c6e7 libavcodec

Remove the block with always false condition from vc1_parse_frame_header()
author kostya
date Fri, 23 Jan 2009 06:33:04 +0000
parents 29096719e684
children ead59531f24a
comparison
equal deleted inserted replaced
8639:29096719e684 8640:ad979489c6e7
1172 if (v->extended_mv == 1) v->mvrange = get_unary(gb, 0, 3); 1172 if (v->extended_mv == 1) v->mvrange = get_unary(gb, 0, 3);
1173 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13 1173 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13
1174 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11 1174 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11
1175 v->range_x = 1 << (v->k_x - 1); 1175 v->range_x = 1 << (v->k_x - 1);
1176 v->range_y = 1 << (v->k_y - 1); 1176 v->range_y = 1 << (v->k_y - 1);
1177 if (v->profile == PROFILE_ADVANCED) 1177 if (v->multires && v->s.pict_type != FF_B_TYPE) v->respic = get_bits(gb, 2);
1178 {
1179 if (v->postprocflag) v->postproc = get_bits1(gb);
1180 }
1181 else
1182 if (v->multires && v->s.pict_type != FF_B_TYPE) v->respic = get_bits(gb, 2);
1183 1178
1184 if(v->res_x8 && (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)){ 1179 if(v->res_x8 && (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)){
1185 v->x8_type = get_bits1(gb); 1180 v->x8_type = get_bits1(gb);
1186 }else v->x8_type = 0; 1181 }else v->x8_type = 0;
1187 //av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n", 1182 //av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n",