Merge commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:42:19 +0000 (16:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:42:24 +0000 (16:42 +0200)
* commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1':
  af_channelmap: fix ONE_STR mapping mode

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

Simple merge