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)
commit830a567e96a232943aad93ff67e73471aad19f55
tree3d576a2d9c460858f43255ac25ee35930660fc62
parent87fe0bbd69bfd70558d2d80a1768f94e6d14ed5a
parentdf6737a55f5dc7c0ae5272bc5fa6182836d5481c
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>
libavresample/audio_mix.c