[FFmpeg-cvslog] Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 12:51:10 2014 +0100| [2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a] | committer: Michael Niedermayer

Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

* commit '599b81ca9a8e04a27ddad94af462171d16063167':
  lavfi: add shuffleplanes filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

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

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