[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 14:59:58 2014 +0100| [d168729004a949644f6268dbf5715ae92d43b0d2] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d168729004a949644f6268dbf5715ae92d43b0d2
---