Merge commit 'e843612695007cc623813073754c651ab43021f7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 13:17:41 +0000 (14:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 13:18:01 +0000 (14:18 +0100)
* commit 'e843612695007cc623813073754c651ab43021f7':
  af_channelmap: fix ONE_STR mapping mode

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

Simple merge