Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 11:51:10 +0000 (12:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 12:07:20 +0000 (13:07 +0100)
commit2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a
tree675b3b2b0a1fe5cc983c1d0042ccd55edf5aedc4
parentb76059058aa6ca89836d450b7b07797ebc2d69ec
parent599b81ca9a8e04a27ddad94af462171d16063167
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@gmx.at>
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
libavfilter/vf_shuffleplanes.c