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>

diff --combined libavresample/audio_mix.c
index 0e7f469a38c9ad3ec1ac5dc0f9b75f67a6e834bf,073609e7eec8e19c899e2bb955af736b0e9fe1f4..1b48fe56005f50e131b1f103efac1c92a33d3fdf
--- 1/libavresample/audio_mix.c
--- 2/libavresample/audio_mix.c
+++ b/libavresample/audio_mix.c
@@@ -1,20 -1,20 +1,20 @@@
  /*
   * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -201,23 -201,23 +201,23 @@@ static void mix_1_to_2_fltp_flt_c(floa
  
      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--;
      }
  }