RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-10-13 06:42:44 +02:00
parent 87fe0bbd69 df6737a55f
commit 830a567e96
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavresample/audio_mix.c
View File

@ -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--;
}
}