diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 06:42:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 06:48:35 +0200 |
| commit | 830a567e96a232943aad93ff67e73471aad19f55 (patch) | |
| tree | 3d576a2d9c460858f43255ac25ee35930660fc62 /libavresample | |
| parent | 87fe0bbd69bfd70558d2d80a1768f94e6d14ed5a (diff) | |
| parent | df6737a55f5dc7c0ae5272bc5fa6182836d5481c (diff) | |
| download | ffmpeg-830a567e96a232943aad93ff67e73471aad19f55.tar.gz | |
Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'
* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c':
audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/audio_mix.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index 0e7f469a38..1b48fe5600 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -201,23 +201,23 @@ static void mix_1_to_2_fltp_flt_c(float **samples, float **matrix, int len, while (len > 4) { v = *src++; - *dst0++ = v * m1; - *dst1++ = v * m0; + *dst0++ = v * m0; + *dst1++ = v * m1; v = *src++; - *dst0++ = v * m1; - *dst1++ = v * m0; + *dst0++ = v * m0; + *dst1++ = v * m1; v = *src++; - *dst0++ = v * m1; - *dst1++ = v * m0; + *dst0++ = v * m0; + *dst1++ = v * m1; v = *src++; - *dst0++ = v * m1; - *dst1++ = v * m0; + *dst0++ = v * m0; + *dst1++ = v * m1; len -= 4; } while (len > 0) { v = *src++; - *dst0++ = v * m1; - *dst1++ = v * m0; + *dst0++ = v * m0; + *dst1++ = v * m1; len--; } } |