diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:51:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:51:26 +0100 |
| commit | f479c178943fdaee5f8d92f88658c57bec3e40b3 (patch) | |
| tree | eee37f3280b03504e69abc0cf7c7f9a49129cf3b /libavresample/audio_mix.c | |
| parent | 1203e92181b4c4af4ba1aa0edc1da3ae8447f9b4 (diff) | |
| parent | 65830277d2d2ee3658e1f070a61044fff261ed3e (diff) | |
| download | ffmpeg-f479c178943fdaee5f8d92f88658c57bec3e40b3.tar.gz | |
Merge commit '65830277d2d2ee3658e1f070a61044fff261ed3e' into release/1.1
* commit '65830277d2d2ee3658e1f070a61044fff261ed3e':
prores: Add a codepath for decoding errors
nut: Fix unchecked allocations
avi: directly resync on DV in AVI read failure
mov: Don't allocate arrays with av_malloc that will be realloced
shorten: Extend fixed_coeffs to properly support pred_order 0
Prepare for 9.11 RELEASE
avi: properly fail if the dv demuxer is missing
prores: Reject negative run and level values
audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
indeo4: Check the inherited quant_mat
Conflicts:
RELEASE
libavcodec/indeo4.c
libavcodec/shorten.c
libavformat/nut.c
libavformat/nutdec.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.c')
| -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 c0560288a5..f737a30fc8 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -195,23 +195,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--; } } |