summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2010-01-18 04:32:47 +0000
committerNils Wallménius <nils@rockbox.org>2010-01-18 04:32:47 +0000
commit135d983433e741cf9658ff5d7457bdf37ef48ce0 (patch)
tree6beb84178202933e1534e8bb70befc70f70ca004 /apps
parentcf39c86d3d5491c4fff58ce138a87c8bb6cad9d9 (diff)
downloadrockbox-135d983433e741cf9658ff5d7457bdf37ef48ce0.tar.gz
rockbox-135d983433e741cf9658ff5d7457bdf37ef48ce0.tar.bz2
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
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/mp3_enc.c6
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)
* |mmmmmmmmmmmmmmmm|mmmmmmmmmmmmmmmm|
*/
uint16_t *samp = &mfbuf[2*512];
- uint16_t *samp_end = samp + samp_per_frame;
+ uint16_t *samp_end = samp + 2*samp_per_frame;
inline void to_mono(uint16_t **samp)
{
- int16_t l = **samp;
- int16_t r = **(samp+1);
+ int16_t r = **samp;
+ int16_t l = *(*samp+1);
int32_t m;
switch(cfg.rec_mono_mode)