From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 13 Oct 2013 04:42:44 +0000 (+0200)
Subject: Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=830a567e96a232943aad93ff67e73471aad19f55;p=ffmpeg

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>
---

830a567e96a232943aad93ff67e73471aad19f55