diff options
| author | Nils Wallménius <nils@rockbox.org> | 2010-01-18 04:32:47 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2010-01-18 04:32:47 +0000 |
| commit | 135d983433e741cf9658ff5d7457bdf37ef48ce0 (patch) | |
| tree | 6beb84178202933e1534e8bb70befc70f70ca004 | |
| parent | cf39c86d3d5491c4fff58ce138a87c8bb6cad9d9 (diff) | |
| download | rockbox-135d983433e741cf9658ff5d7457bdf37ef48ce0.tar.gz rockbox-135d983433e741cf9658ff5d7457bdf37ef48ce0.zip | |
This should fix FS#10917, and also fix channel swapping i introduced in r23784. Lets hope the third time's the charm
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24271 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/codecs/mp3_enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/mp3_enc.c b/apps/codecs/mp3_enc.c index 20f5932576..d04b9e6c42 100644 --- a/apps/codecs/mp3_enc.c +++ b/apps/codecs/mp3_enc.c | |||
| @@ -2091,12 +2091,12 @@ STATICIRAM void to_mono_mm(void) | |||
| 2091 | * |mmmmmmmmmmmmmmmm|mmmmmmmmmmmmmmmm| | 2091 | * |mmmmmmmmmmmmmmmm|mmmmmmmmmmmmmmmm| |
| 2092 | */ | 2092 | */ |
| 2093 | uint16_t *samp = &mfbuf[2*512]; | 2093 | uint16_t *samp = &mfbuf[2*512]; |
| 2094 | uint16_t *samp_end = samp + samp_per_frame; | 2094 | uint16_t *samp_end = samp + 2*samp_per_frame; |
| 2095 | 2095 | ||
| 2096 | inline void to_mono(uint16_t **samp) | 2096 | inline void to_mono(uint16_t **samp) |
| 2097 | { | 2097 | { |
| 2098 | int16_t l = **samp; | 2098 | int16_t r = **samp; |
| 2099 | int16_t r = **(samp+1); | 2099 | int16_t l = *(*samp+1); |
| 2100 | int32_t m; | 2100 | int32_t m; |
| 2101 | 2101 | ||
| 2102 | switch(cfg.rec_mono_mode) | 2102 | switch(cfg.rec_mono_mode) |