# HG changeset patch # User jbr # Date 1237596487 0 # Node ID 2acf888276af2c9f7435ad5466d9e326e6603e19 # Parent ca10c935dc56c1786cc7d6960821dddace8301c0 flacdec: remove unneeded variable, 'assignment' diff -r ca10c935dc56 -r 2acf888276af flacdec.c --- a/flacdec.c Sat Mar 21 00:47:04 2009 +0000 +++ b/flacdec.c Sat Mar 21 00:48:07 2009 +0000 @@ -492,21 +492,19 @@ static int decode_frame(FLACContext *s, int alloc_data_size) { - int blocksize_code, sample_rate_code, sample_size_code, assignment, i, crc8; + int blocksize_code, sample_rate_code, sample_size_code, i, crc8; int ch_mode, bps, blocksize, samplerate; blocksize_code = get_bits(&s->gb, 4); sample_rate_code = get_bits(&s->gb, 4); - assignment = get_bits(&s->gb, 4); /* channel assignment */ - if (assignment < FLAC_MAX_CHANNELS && s->channels == assignment+1) + ch_mode = get_bits(&s->gb, 4); /* channel assignment */ + if (ch_mode < FLAC_MAX_CHANNELS && s->channels == ch_mode+1) { ch_mode = FLAC_CHMODE_INDEPENDENT; - else if (assignment >= FLAC_MAX_CHANNELS && assignment < 11 && s->channels == 2) - ch_mode = assignment; - else { + } else if (ch_mode > FLAC_CHMODE_MID_SIDE || s->channels != 2) { av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n", - assignment, s->channels); + ch_mode, s->channels); return -1; }