[FFmpeg-cvslog] r18085 - trunk/libavcodec/flacdec.c
jbr
subversion
Sat Mar 21 01:48:07 CET 2009
Author: jbr
Date: Sat Mar 21 01:48:07 2009
New Revision: 18085
Log:
flacdec: remove unneeded variable, 'assignment'
Modified:
trunk/libavcodec/flacdec.c
Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c Sat Mar 21 01:47:04 2009 (r18084)
+++ trunk/libavcodec/flacdec.c Sat Mar 21 01:48:07 2009 (r18085)
@@ -492,21 +492,19 @@ static inline int decode_subframe(FLACCo
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;
}
More information about the ffmpeg-cvslog
mailing list