# HG changeset patch # User iive # Date 1182954467 0 # Node ID 19ed7e6ef92724e17327245d41203d9c0c55f22a # Parent 3bfa0f33c85417f21edeb6f9a6b4dc7edd4e6251 Identify the loop_filter flag as such and remove the unused variables in the context. diff -r 3bfa0f33c854 -r 19ed7e6ef927 wmv2.c --- a/wmv2.c Wed Jun 27 10:40:29 2007 +0000 +++ b/wmv2.c Wed Jun 27 14:27:47 2007 +0000 @@ -36,8 +36,6 @@ MpegEncContext s; int j_type_bit; int j_type; - int flag3; - int flag63; int abt_flag; int abt_type; int abt_type_table[6]; @@ -74,7 +72,7 @@ put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047)); put_bits(&pb, 1, w->mspel_bit=1); - put_bits(&pb, 1, w->flag3=1); + put_bits(&pb, 1, s->loop_filter); put_bits(&pb, 1, w->abt_flag=1); put_bits(&pb, 1, w->j_type_bit=1); put_bits(&pb, 1, w->top_left_mv_flag=0); @@ -329,7 +327,7 @@ fps = get_bits(&gb, 5); s->bit_rate = get_bits(&gb, 11)*1024; w->mspel_bit = get_bits1(&gb); - w->flag3 = get_bits1(&gb); + s->loop_filter = get_bits1(&gb); w->abt_flag = get_bits1(&gb); w->j_type_bit = get_bits1(&gb); w->top_left_mv_flag= get_bits1(&gb); @@ -341,8 +339,8 @@ s->slice_height = s->mb_height / code; if(s->avctx->debug&FF_DEBUG_PICT_INFO){ - av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, flag3:%d, slices:%d\n", - fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, w->flag3, + av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, loop_filter:%d, slices:%d\n", + fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, s->loop_filter, code); } return 0;