projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
312954f
)
simplify
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 24 Aug 2006 08:39:07 +0000
(08:39 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 24 Aug 2006 08:39:07 +0000
(08:39 +0000)
Originally committed as revision 6067 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mpegaudiodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegaudiodec.c
b/libavcodec/mpegaudiodec.c
index
a47bcb9
..
04d65a5
100644
(file)
--- 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);