Anton Khirnov
bc1a985ba0
lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().
...
Since we do not support "standalone" filters not attached to an
AVFilterGraph, we should not have a public function to create such
filters. In addition that function is horribly named, the action it does
cannot be possibly described as "opening" a filter.
2013-04-11 20:34:14 +02:00
Anton Khirnov
4a37d4b3f8
lavfi: add const to the pads parameter of avfilter_pad_get_name/type
2013-04-11 20:33:23 +02:00
Clément Bœsch
c1907bd732
lavfi/removelogo: switch to an AVOptions-based system.
2013-04-11 18:49:46 +02:00
Clément Bœsch
c74b0eda34
lavfi/amerge: switch to an AVOptions-based system.
2013-04-11 18:31:01 +02:00
Clément Bœsch
23a750c994
lavfi: do not warn inappropriately with aevalsrc.
2013-04-11 18:01:12 +02:00
Clément Bœsch
64ce15b9f4
lavfi/aevalsrc: switch to an AVOptions-based system.
2013-04-11 17:28:02 +02:00
Clément Bœsch
ad9e66a565
lavfi: add pp to the ':'-to-'|' compat layer.
2013-04-11 15:52:46 +02:00
Clément Bœsch
e2e992c077
lavfi/asetnsamples: switch to an AVOptions-based system.
2013-04-11 15:40:15 +02:00
Clément Bœsch
1c0feee059
lavfi/anullsrc: switch to an AVOptions-based system.
2013-04-11 15:21:40 +02:00
Clément Bœsch
7464b9e319
lavfi: remove bbox from the filters left to update.
...
The filter doesn't take any option and thus works with the new system.
2013-04-11 15:14:07 +02:00
Clément Bœsch
7fdebb116c
lavfi/astreamsync: switch to an AVOptions-based system.
2013-04-11 15:09:25 +02:00
Clément Bœsch
ab4afcb85b
lavfi/blackdetect: switch to an AVOptions-based system.
2013-04-11 14:48:19 +02:00
Clément Bœsch
7eb1ea2ae6
lavfi/sendcmd: switch to an AVOptions-based system.
2013-04-11 14:40:02 +02:00
Michael Niedermayer
dd97736d4f
avfilter: add missing ,
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 14:31:10 +02:00
Paul B Mahol
38d1a5a270
lavfi/smptebars: switch to AVOptions-based system
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 12:22:42 +00:00
Clément Bœsch
3c2e4c2a9b
lavfi/showwaves: switch to an AVOptions-based system.
2013-04-11 14:18:44 +02:00
Clément Bœsch
38788f2de5
lavfi: replace new filter list with filters left to update.
2013-04-11 14:06:39 +02:00
Paul B Mahol
661e284b4a
telecine filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:12:39 +00:00
Clément Bœsch
77add967a5
lavfi/setfield: switch to an AVOptions-based system.
2013-04-11 11:53:53 +02:00
Clément Bœsch
73c1a00e73
lavfi/asettb: switch to an AVOptions-based system.
2013-04-11 11:53:53 +02:00
Clément Bœsch
cb2327e88d
lavfi/aselect: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
Clément Bœsch
bca4cafaf2
lavfi/sine: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
Clément Bœsch
9ceb7bdf6f
lavfi/deshake: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
Clément Bœsch
c85f56bb4f
lavfi/tinterlace: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
Clément Bœsch
64a103138c
lavfi/tile: switch to an AVOptions-based system.
2013-04-11 11:51:47 +02:00
Clément Bœsch
35a27402ad
lavfi/concat: switch to an AVOptions-based system.
2013-04-11 11:51:47 +02:00
Michael Niedermayer
d7e8b3d831
Merge remote-tracking branch 'ubitux/lavfi-mixed-short-long'
...
* ubitux/lavfi-mixed-short-long:
lavfi: restore mixed short/long option support with the new system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 11:09:51 +02:00
Michael Niedermayer
44d4488301
Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'
...
* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
lavfi: add avfilter_get_class().
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 10:59:06 +02:00
Clément Bœsch
b89ce54e74
lavfi: restore mixed short/long option support with the new system.
...
process_unnamed_options() is renamed to process_options() and its code
is heavily based on av_opt_set_from_string().
2013-04-11 10:48:58 +02:00
Michael Niedermayer
0965be00fe
Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'
...
* commit '4d1f31ea44f82adfb2b712534d71e27233a4f785':
lavfi: make AVFilterContext export filter options.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 10:42:49 +02:00
Michael Niedermayer
c7b0a84e1f
Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'
...
* commit '62549f9655c48f0ec061087fa33a96040ce01145':
lavfi: error out when options are provided to a filter that does not take any
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 10:34:05 +02:00
Michael Niedermayer
ef29a95a4d
Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'
...
* commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1':
vsrc_testsrc: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 10:02:07 +02:00
Michael Niedermayer
3a3d984445
Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'
...
* commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303':
vsrc_movie: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 03:41:08 +02:00
Michael Niedermayer
670e0f7f66
Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'
...
* commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e':
vsrc_nullsrc: switch to an AVOptions-based system.
Conflicts:
libavfilter/vsrc_nullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 03:20:43 +02:00
Michael Niedermayer
8bafd83aaa
Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'
...
* commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe':
vsrc_color: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 03:10:43 +02:00
Michael Niedermayer
7f2198a2f1
Merge commit '73d5d405d424c06f3f354337cfdb24794932094d'
...
* commit '73d5d405d424c06f3f354337cfdb24794932094d':
split: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:50:21 +02:00
Michael Niedermayer
ae6634da8b
Merge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59'
...
* commit 'b13623e184759f37348b8fdb1276b1bb408f3e59':
af_volume: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:44:13 +02:00
Michael Niedermayer
8905a811b7
Merge remote-tracking branch 'richardpl/biquads'
...
* richardpl/biquads:
lavfi/biquads: switch to an AVOptions-based system
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:38:05 +02:00
Michael Niedermayer
42c70b3584
Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
...
* commit 'dd7fc37c71955b78a2687f29e871f714d18de386':
af_join: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_join.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:37:43 +02:00
Paul B Mahol
e6067acc8d
lavfi/biquads: switch to an AVOptions-based system
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 00:34:19 +00:00
Michael Niedermayer
5e5ef6e8ae
Merge remote-tracking branch 'richardpl/framestep'
...
* richardpl/framestep:
lavfi/framestep: remove request_frame hack
lavfi/framestep: switch to an AVOptions-based system
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:31:14 +02:00
Paul B Mahol
f77db72965
lavfi/framestep: switch to an AVOptions-based system
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 00:18:28 +00:00
Michael Niedermayer
f17651bd16
Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'
...
* commit '3f14febbdf7c93bbd186399da27991180e5916b6':
af_channelsplit: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_channelsplit.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:17:28 +02:00
Michael Niedermayer
d9d7c54960
Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'
...
* commit 'ba8efac977f4276f05274947b2b67d144cbc965a':
af_channelmap: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_channelmap.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:10:12 +02:00
Michael Niedermayer
5714812237
Merge remote-tracking branch 'mbouron/shorthand-cleanup'
...
* mbouron/shorthand-cleanup:
lavfi/aphaser: switch to AVOption-based system
lavfi/apad: switch to AVOption-based system
lavfi/afade: switch to AVOption-base system
lavfi/blend: switch to AVOption-based system
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 01:53:08 +02:00
Michael Niedermayer
ac217bda30
Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'
...
* commit 'b2b25b0659fa047da6266d2ce165d43011136b30':
af_asyncts: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 01:42:28 +02:00
Matthieu Bouron
f43da3def7
lavfi/aphaser: switch to AVOption-based system
2013-04-11 01:37:57 +02:00
Michael Niedermayer
314be1933e
Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'
...
* commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066':
af_amix: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_amix.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 01:32:08 +02:00
Matthieu Bouron
a5ce5ac9fb
lavfi/apad: switch to AVOption-based system
2013-04-11 01:31:08 +02:00
Matthieu Bouron
2b17e58163
lavfi/afade: switch to AVOption-base system
2013-04-11 01:25:02 +02:00
Matthieu Bouron
6afed2aec1
lavfi/blend: switch to AVOption-based system
2013-04-11 01:25:02 +02:00
Michael Niedermayer
ab6091f8e2
Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'
...
* commit '7536c671040f1f3ebc9f0d3b7831dac71436b775':
vf_yadif: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_yadif.c
libavfilter/yadif.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 01:18:18 +02:00
Michael Niedermayer
8ac7090c23
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
...
* ubitux/shorthand-cleanup:
lavfi/idet: switch to an AVOptions-based system.
lavfi/histogram: switch to an AVOptions-based system.
lavfi/stereo3d: switch to an AVOptions-based system.
lavfi/noise: switch to an AVOptions-based system.
lavfi/histeq: switch to an AVOptions-based system.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 01:05:14 +02:00
Clément Bœsch
7668b6832d
lavfi/idet: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
Clément Bœsch
b2d589188f
lavfi/histogram: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
Clément Bœsch
d5226fc575
lavfi/stereo3d: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
Clément Bœsch
a689a6b698
lavfi/noise: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
Clément Bœsch
e4bd1db88e
lavfi/histeq: switch to an AVOptions-based system.
2013-04-11 01:04:44 +02:00
Michael Niedermayer
72ce979f10
Merge remote-tracking branch 'mbouron/shorthand-cleanup'
...
* mbouron/shorthand-cleanup:
lavfi/kerndeint: switch to AVOption-based system
lavfi/il: switch to AVOption-based system
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 01:03:08 +02:00
Michael Niedermayer
c2696dabbb
Merge commit 'b83e9efc53e5491716625aa31c69006b1119b280'
...
* commit 'b83e9efc53e5491716625aa31c69006b1119b280':
vf_unsharp: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 01:02:07 +02:00
Matthieu Bouron
531158e6be
lavfi/kerndeint: switch to AVOption-based system
2013-04-11 00:55:45 +02:00
Michael Niedermayer
b4ffc35e76
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
...
* ubitux/shorthand-cleanup:
lavfi/mptestsrc: switch to an AVOptions-based system.
lavfi/mandelbrot: switch to an AVOptions-based system.
lavfi/life: switch to an AVOptions-based system.
lavfi/cellauto: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 00:37:32 +02:00
Michael Niedermayer
a4e0defa75
Merge commit '0c2466dec719b933d161f5d680a57fde38aa5daa'
...
* commit '0c2466dec719b933d161f5d680a57fde38aa5daa':
vf_transpose: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 00:33:31 +02:00
Matthieu Bouron
6f46403cb0
lavfi/il: switch to AVOption-based system
2013-04-11 00:31:25 +02:00
Clément Bœsch
4ecee69b20
lavfi/mptestsrc: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
Clément Bœsch
791da4706c
lavfi/mandelbrot: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
Clément Bœsch
bd85fee914
lavfi/life: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
Clément Bœsch
169880e31d
lavfi/cellauto: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
Stefano Sabatini
cff8f91ddf
lavfi/decimate: switch to an AVOption-based system
2013-04-11 00:20:01 +02:00
Stefano Sabatini
2040b428b4
lavfi/field: switch to AVOption-based system
...
Also remove mention to syntax explanation which is or will be redundant
and possibly confusing.
2013-04-11 00:16:25 +02:00
Michael Niedermayer
6a2fb5b90c
Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'
...
* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd':
vf_settb: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_settb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 00:10:59 +02:00
Stefano Sabatini
2ffee3ec14
lavfi/smartblur: switch to AVOption-based system
2013-04-11 00:04:27 +02:00
Michael Niedermayer
f42635a50b
Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'
...
* commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff':
vf_setpts: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 23:49:58 +02:00
Michael Niedermayer
270d3c96ec
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
...
* ubitux/shorthand-cleanup:
lavfi/subtitles: switch to an AVOptions-based system.
lavfi/pp: switch to an AVOptions-based system.
lavfi/geq: switch to an AVOptions-based system.
lavfi/edgedetect: switch to an AVOptions-based system.
lavfi/curves: switch to an AVOptions-based system.
lavfi/colormatrix: switch to an AVOptions-based system.
lavfi/perms: switch to an AVOptions-based system.
lavfi/ebur128: switch to an AVOptions-based system.
lavfi/showspectrum: switch to an AVOptions-based system.
lavfi/silencedetect: switch to an AVOptions-based system.
lavfi/thumbnail: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 23:29:05 +02:00
Michael Niedermayer
b3fb2d8cec
Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'
...
* commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e':
vf_select: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_select.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 23:24:48 +02:00
Clément Bœsch
e2b0edb6ac
lavfi/subtitles: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
Clément Bœsch
8da1fff85a
lavfi/pp: switch to an AVOptions-based system.
...
Also add and use the '|' separator instead of ':' since it's
incompatible with the new option system...
2013-04-10 23:16:03 +02:00
Clément Bœsch
f8eabab04d
lavfi/geq: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
Clément Bœsch
1cdb9f48db
lavfi/edgedetect: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
Clément Bœsch
34610e11e7
lavfi/curves: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
Clément Bœsch
8da1f1f208
lavfi/colormatrix: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
Clément Bœsch
8388e1e2b3
lavfi/perms: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
Clément Bœsch
5afd58fbb4
lavfi/ebur128: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
Clément Bœsch
4964ec2cd4
lavfi/showspectrum: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
Clément Bœsch
1b1688bfc6
lavfi/silencedetect: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
Clément Bœsch
7c11c21669
lavfi/thumbnail: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
Michael Niedermayer
7e99ccf5d8
Merge commit '40c885c589808455a1c4b473509f1e6cd4908f55'
...
* commit '40c885c589808455a1c4b473509f1e6cd4908f55':
vf_pad: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_pad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 22:50:32 +02:00
Michael Niedermayer
e434ddd4c6
Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'
...
* commit '9087eaf193b8ce99c41352064a81916fa66adb49':
vf_overlay: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 22:27:20 +02:00
Michael Niedermayer
8bdb119197
Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'
...
* commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6':
vf_lut: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 22:13:34 +02:00
Michael Niedermayer
94ec709e3b
Merge commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319'
...
* commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319':
vf_libopencv: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 21:25:01 +02:00
Michael Niedermayer
f780a90355
Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'
...
* commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a':
vf_hqdn3d: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 21:14:30 +02:00
Michael Niedermayer
1ee9eacaa4
Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'
...
* commit '7ed833d78ea661d619124fd898547a900f6480bc':
vf_gradfun: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/gradfun.h
libavfilter/vf_gradfun.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 21:09:06 +02:00
Michael Niedermayer
85f115b5d8
Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'
...
* commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401':
vf_scale: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_scale.c
scale keeps using our shorthand system due to the alternative not
supporting the more complex syntactical things like 1 parameter
dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 20:40:37 +02:00
Michael Niedermayer
da3f89988f
Merge commit '5aa1a668cfae7f617e1a06efad20f87283badd8a'
...
* commit '5aa1a668cfae7f617e1a06efad20f87283badd8a':
vf_frei0r: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 19:51:02 +02:00
Michael Niedermayer
81c1ed748b
Merge commit 'f13ab29925883b4245da4129694af3af378d67be'
...
* commit 'f13ab29925883b4245da4129694af3af378d67be':
vf_fps: switch to an AVOptions-based system.
Conflicts:
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 19:21:59 +02:00
Michael Niedermayer
b8a1f8b4e2
Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'
...
* commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec':
vf_fieldorder: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_fieldorder.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 19:03:30 +02:00
Michael Niedermayer
0c3d706bdb
Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'
...
* commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd':
vf_fade: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 18:48:07 +02:00
Michael Niedermayer
d70b494422
Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'
...
* commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a':
vf_drawtext: switch to an AVOptions-based system.
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 18:31:14 +02:00
Michael Niedermayer
0726d516dc
Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'
...
* commit '335c31293baec6e6cf5907bd29840af3de8ff735':
vf_drawbox: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_drawbox.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 18:11:15 +02:00
Michael Niedermayer
eebe0b0224
Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'
...
* commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e':
vf_delogo: switch to an AVOptions-based system.
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 17:54:20 +02:00