Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 02:46:36 +0000 (04:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 02:47:31 +0000 (04:47 +0200)
* commit 'f0e959481968b6d906931127237ed981b6414f6e':
  af_channelmap: Set the frame channel layout

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

Simple merge