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)
commit9a884b7b97c9780c84980560c88b3d3eca992101
tree3a3cdd1ba940e3feda20776743f54ff6fdecfdc1
parent9abe0bfb7f52d450c9c4b392d8c4b88007562b31
parent80239a8bb11f730d95f03dfbd0deab258b413b0e
Merge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2

* commit '80239a8bb11f730d95f03dfbd0deab258b413b0e':
  af_channelmap: fix ONE_STR mapping mode

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