diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-21 03:48:07 +0300 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-21 03:48:07 +0300 |
commit | d9e7fa8074c2ecbaefce76b214fddf79d5f4464f (patch) | |
tree | 34a24741975b9addaffd717dc89da2851027828c /libavcodec/flacdec.c | |
parent | 2a34672500f22f6411f2392ad772238eae20ba67 (diff) |
flacdec: remove unneeded variable, 'assignment'
Originally committed as revision 18085 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flacdec.c')
-rw-r--r-- | libavcodec/flacdec.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index e5a7710d7b..7a63d8a9a4 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -492,21 +492,19 @@ static inline int decode_subframe(FLACContext *s, int channel) 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; } |