summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-08-24 08:39:07 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-08-24 08:39:07 +0000
commita753e55bb542a1c474754cdd405a7ae4265222aa (patch)
treec00dcaadab76f6e520fe76010d6968a9e150514e
parent312954f05688bc917b68bfd292546341527252b8 (diff)
simplify
Originally committed as revision 6067 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpegaudiodec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index a47bcb9ca7..04d65a51b5 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2159,10 +2159,7 @@ static int mp_decode_layer3(MPADecodeContext *s)
/* read side info */
if (s->lsf) {
main_data_begin = get_bits(&s->gb, 8);
- if (s->nb_channels == 2)
- private_bits = get_bits(&s->gb, 2);
- else
- private_bits = get_bits(&s->gb, 1);
+ private_bits = get_bits(&s->gb, s->nb_channels);
nb_granules = 1;
} else {
main_data_begin = get_bits(&s->gb, 9);