Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 13:59:58 +0000 (14:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 14:18:14 +0000 (15:18 +0100)
* qatar/master:
  vf_shuffleplanes: fix the type of the mapping indices

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

Simple merge