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)
commitd168729004a949644f6268dbf5715ae92d43b0d2
tree4adbbb8899add9ca26603870ae98bbdb66ec9f1f
parent2d99de66b7f1f805ae75d7502508ede18b52e95a
parent713d3f98c8b0ff6cc86985d9e4d85e3f5b3c7004
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_shuffleplanes: fix the type of the mapping indices

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