Michael Niedermayer
|
ffe7e7c195
|
avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-06 16:58:24 +01:00 |
|
Michael Niedermayer
|
d168729004
|
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_shuffleplanes: fix the type of the mapping indices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-06 15:18:14 +01:00 |
|
Michael Niedermayer
|
2fb0027c26
|
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>
|
2014-03-06 13:07:20 +01:00 |
|
Anton Khirnov
|
713d3f98c8
|
vf_shuffleplanes: fix the type of the mapping indices
They are TYPE_INT AVOptions, so they must be ints
|
2014-03-06 09:24:53 +01:00 |
|
Anton Khirnov
|
599b81ca9a
|
lavfi: add shuffleplanes filter
|
2014-03-05 21:52:02 +01:00 |
|