diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 12:51:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 13:07:20 +0100 |
| commit | 2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a (patch) | |
| tree | 675b3b2b0a1fe5cc983c1d0042ccd55edf5aedc4 /CREDITS | |
| parent | b76059058aa6ca89836d450b7b07797ebc2d69ec (diff) | |
| parent | 599b81ca9a8e04a27ddad94af462171d16063167 (diff) | |
| download | ffmpeg-2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a.tar.gz | |
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>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions