Merge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 18:56:37 +0000 (19:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 18:56:37 +0000 (19:56 +0100)
* commit '80239a8bb11f730d95f03dfbd0deab258b413b0e':
  af_channelmap: fix ONE_STR mapping mode

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

Simple merge