Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 04:42:44 +0000 (06:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 04:48:35 +0000 (06:48 +0200)
* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/audio_mix.c

Simple merge