835cc0f2e7
Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
...
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
lavfi: change the filter registering system to match the other libraries
Conflicts:
cmdutils.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h
This removes the ability to put AVFilters in read only memory and having
them shareable.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:08:40 +02:00
f4db6bfeb8
Merge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa'
...
* commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa':
lavfi: add a function for counting elements in AVFilterPad arrays.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 14:49:30 +02:00
16fc24b240
Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'
...
* commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65':
lavfi: mark filters with dynamic number of inputs or outputs with special flags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 14:30:34 +02:00
46de9ba598
Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58'
...
* commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58':
lavfi: add avfilter_init_dict() for initializing a filter with a dict.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 14:25:27 +02:00
e48ded8551
lavfi/buffersink: accept parameters as options.
...
Move validation from init to query_formats().
Accept the formats lists as binary options.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:12:51 +02:00
af0d270aac
lavu: add helper functions for integer lists.
...
Add av_int_list_length() to compute a list length.
Add av_opt_set_int_list() to set a binary option.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:09:51 +02:00
dee2db523d
doc/filters: update volume options description.
2013-04-12 11:51:54 +02:00
ae8d435ba8
doc/filters: add quick emboss example
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-12 09:47:41 +00:00
9c5f392cbc
doc/cropdetect: update boxblur options description.
2013-04-12 10:59:05 +02:00
9811b7942d
doc/crop: update boxblur options description.
2013-04-12 10:59:05 +02:00
fc15ad408c
doc/filters: update boxblur options description.
2013-04-12 10:59:05 +02:00
8876b0816d
doc/filters: update blackframe options description.
2013-04-12 10:59:05 +02:00
710b0aa801
Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'
...
* commit '48a5adab62bd2a553f5069d41fa632a0701835e5':
lavfi: add avfilter_init_str() to replace avfilter_init_filter().
avfilter_graph_create_filter() opaque is still passed to avfilter_init_filter()
which continues to pass it to init_opaque as its still used in the buffer sinks
the sinks should be changed and the opaque passing removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 01:31:55 +02:00
4fde705396
Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'
...
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
lavfi: add AVFilterContext.graph.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 00:44:18 +02:00
5c68e14e42
Merge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee'
...
* commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee':
lavfi: deprecate avfilter_graph_add_filter().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 00:39:09 +02:00
86070b8e5a
Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'
...
* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 00:31:44 +02:00
fdedfc029b
doc/filters: rework Commands section for overlay filter
2013-04-12 00:18:39 +02:00
b2e22731e4
doc/filters: apply minor fixes to hue Commands section
2013-04-12 00:18:32 +02:00
ed2c827575
lavfi/overlay: add repeatlast option
2013-04-12 00:09:19 +02:00
231fd4411f
Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'
...
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
lavfi: merge avfiltergraph.h into avfilter.h
Conflicts:
doc/APIchanges
ffmpeg_filter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.h
libavfilter/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 23:50:39 +02:00
9110f95985
doc/filters: use -af and -filter_complex instead of amovie for two examples.
2013-04-11 23:47:12 +02:00
70b72ca6f3
doc/encoders: Clarify that there are 2 prores encoders
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 23:13:34 +02:00
d980641ec4
doc/filters: fix fade-out hue saturation expression in sendcmd example
2013-04-11 23:03:18 +02:00
9ad27cd447
doc/filters: update hue command syntax after recent update
2013-04-11 23:03:18 +02:00
97104aa011
Merge commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6'
...
* commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6':
doc: document the prores encoder options
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 22:36:12 +02:00
9ab221f8d8
lavfi: deprecate aconvert.
...
This filter is not required anymore with aformat. Drop it at next bump.
2013-04-11 22:13:45 +02:00
71ef1ec7b4
lavfi/aspect: switch to an AVOptions-based system.
...
This is heavily based on 2831b307
2013-04-11 22:05:03 +02:00
647fe2e777
Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
...
* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
img2enc: add an option for overwriting one file with subsequent images
Conflicts:
doc/muxers.texi
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 21:50:53 +02:00
976e3439ed
lavfi/flite: switch to AVOption-based system
2013-04-11 21:37:48 +02:00
e4fd58f472
lavfi/hue: apply major simplifications, and switch to AVOption-based system
...
This also drops support for "flat syntax" and "reinit" command.
"reinit" command is not very robust and complicates the logic more than
necessary, since requires to reset all the options in the command.
*This is a syntax break*.
2013-04-11 21:37:19 +02:00
3fce136798
lavfi: new interlace filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-11 21:33:07 +02:00
921046008f
cmdutils: allow -h filter=<name> to print information about a filter.
2013-04-11 20:46:11 +02:00
fa2a34cd40
lavfi: change the filter registering system to match the other libraries
...
Removes an arbitrary hardcoded limit on the number of filters.
2013-04-11 20:44:03 +02:00
7e8fe4be5f
lavfi: add a function for counting elements in AVFilterPad arrays.
...
The caller needs to know what valid indices can be passed to
avfilter_pad_get_name/type.
2013-04-11 20:43:47 +02:00
7cdd737ba8
lavfi: mark filters with dynamic number of inputs or outputs with special flags
...
This will be useful in avtools in the following commits.
Any other caller might also want to know this information.
2013-04-11 20:42:41 +02:00
1ba95a9cca
lavfi: add avfilter_init_dict() for initializing a filter with a dict.
2013-04-11 20:40:20 +02:00
48a5adab62
lavfi: add avfilter_init_str() to replace avfilter_init_filter().
...
Drop the unused opaque parameter from its signature.
2013-04-11 20:39:13 +02:00
111367263a
lavfi: add AVFilterContext.graph.
...
It will be useful in the following commits.
2013-04-11 20:38:23 +02:00
c2c9801bc9
lavfi: deprecate avfilter_graph_add_filter().
...
Since this function adds a standalone filter to a filter graph and we do
not support creating such filters, there is no reason for this function
to exist.
2013-04-11 20:36:42 +02:00
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
38f0c0781a
lavfi: merge avfiltergraph.h into avfilter.h
...
We do not support using filters without AVFilterGraph in practice
anyway, so there is no point in pretending we do.
2013-04-11 20:33:33 +02:00
c1907bd732
lavfi/removelogo: switch to an AVOptions-based system.
2013-04-11 18:49:46 +02:00
c74b0eda34
lavfi/amerge: switch to an AVOptions-based system.
2013-04-11 18:31:01 +02:00
64ce15b9f4
lavfi/aevalsrc: switch to an AVOptions-based system.
2013-04-11 17:28:02 +02:00
e2e992c077
lavfi/asetnsamples: switch to an AVOptions-based system.
2013-04-11 15:40:15 +02:00
1c0feee059
lavfi/anullsrc: switch to an AVOptions-based system.
2013-04-11 15:21:40 +02:00
7fdebb116c
lavfi/astreamsync: switch to an AVOptions-based system.
2013-04-11 15:09:25 +02:00
ab4afcb85b
lavfi/blackdetect: switch to an AVOptions-based system.
2013-04-11 14:48:19 +02:00
3c2e4c2a9b
lavfi/showwaves: switch to an AVOptions-based system.
2013-04-11 14:18:44 +02:00
eeb6efcd58
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
fate: add tests for unknown channel layouts.
lavfi/buffersrc: update for compatibility with the fork.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:28:24 +02:00
661e284b4a
telecine filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:12:39 +00:00
0d58bbb28d
lavfi/buffersrc: update for compatibility with the fork.
...
Merge and adapt commit d28cb84
2013-04-11 13:09:10 +02:00
7e7dc1489f
lavfi/curves: make possible to customize presets.
2013-04-11 13:05:06 +02:00
c66c92add6
doc/opencl: speling and gramer fixes
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:00:04 +02:00
9d442b9cc0
opencl: add spec opencl device APIs 20130411
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 12:46:34 +02:00
f223ad1e00
doc: document the prores encoder options
...
Adapted from the author's blag.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-11 12:42:09 +02:00
4c9b031559
lavfi/smartblur: cleanup unused shorthand and doc.
2013-04-11 12:41:13 +02:00
3417280b57
lavfi/field: cleanup unused shorthand and doc.
2013-04-11 12:41:13 +02:00
9e6b5e61a0
img2enc: add an option for overwriting one file with subsequent images
...
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
2013-04-11 12:30:44 +02:00
77add967a5
lavfi/setfield: switch to an AVOptions-based system.
2013-04-11 11:53:53 +02:00
73c1a00e73
lavfi/asettb: switch to an AVOptions-based system.
2013-04-11 11:53:53 +02:00
cb2327e88d
lavfi/aselect: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
bca4cafaf2
lavfi/sine: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
9ceb7bdf6f
lavfi/deshake: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
c85f56bb4f
lavfi/tinterlace: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
64a103138c
lavfi/tile: switch to an AVOptions-based system.
2013-04-11 11:51:47 +02:00
35a27402ad
lavfi/concat: switch to an AVOptions-based system.
2013-04-11 11:51:47 +02:00
cb20ca14a3
Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
...
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
x86inc: Fix number of operands for cmp* instructions
af_channelmap: fix uninitialized variable use introduced in ba8efac977
2013-04-11 11:20:55 +02:00
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
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
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
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
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
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
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
f43da3def7
lavfi/aphaser: switch to AVOption-based system
2013-04-11 01:37:57 +02:00
2b17e58163
lavfi/afade: switch to AVOption-base system
2013-04-11 01:25:02 +02:00
6afed2aec1
lavfi/blend: switch to AVOption-based system
2013-04-11 01:25:02 +02:00
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
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
7668b6832d
lavfi/idet: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
b2d589188f
lavfi/histogram: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
d5226fc575
lavfi/stereo3d: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
a689a6b698
lavfi/noise: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
e4bd1db88e
lavfi/histeq: switch to an AVOptions-based system.
2013-04-11 01:04:44 +02:00
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
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
531158e6be
lavfi/kerndeint: switch to AVOption-based system
2013-04-11 00:55:45 +02:00
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
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
6f46403cb0
lavfi/il: switch to AVOption-based system
2013-04-11 00:31:25 +02:00
4ecee69b20
lavfi/mptestsrc: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
791da4706c
lavfi/mandelbrot: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
bd85fee914
lavfi/life: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
169880e31d
lavfi/cellauto: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
cff8f91ddf
lavfi/decimate: switch to an AVOption-based system
2013-04-11 00:20:01 +02:00
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
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
2ffee3ec14
lavfi/smartblur: switch to AVOption-based system
2013-04-11 00:04:27 +02:00
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
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
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
e2b0edb6ac
lavfi/subtitles: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
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
f8eabab04d
lavfi/geq: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
1cdb9f48db
lavfi/edgedetect: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
34610e11e7
lavfi/curves: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
8da1f1f208
lavfi/colormatrix: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
8388e1e2b3
lavfi/perms: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
5afd58fbb4
lavfi/ebur128: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
4964ec2cd4
lavfi/showspectrum: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
1b1688bfc6
lavfi/silencedetect: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
7c11c21669
lavfi/thumbnail: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
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
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
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
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
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
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
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
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
9280fc7da1
vf_curves: add option to set all curves at once
...
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 19:29:11 +02:00
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
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
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
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
215ca86475
doc/filters: review introductory example and explanation
...
In particular, fix wrong vertical mirroring command, and clarify
and extend explanation.
Based on a patch by littlebat <dashing.meng@gmail.com>.
Should fix trac ticket #2413 .
2013-04-10 18:02:00 +02:00
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
200e04c70f
Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'
...
* commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891':
vf_crop: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_crop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 16:56:33 +02:00
eb6d58d23c
Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'
...
* commit '51def31dbe5b6e857536de8fa428f263d64f3ae5':
vf_boxblur: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_boxblur.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 16:34:44 +02:00
43bac121d3
Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'
...
* commit '62dcdb028cc84845fd263bb09304c4c6500bda7a':
vf_blackframe: switch to an AVOptions-based system.
vf_aspect: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
In the aspect filter most changes are merged but not the final
switch to the libav API because that is too restrictive and has
difficulty handling the syntax.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 15:37:21 +02:00
2a2a643c90
Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'
...
* commit 'e67a87eac814c7805d18c983c43033a8a1bd62af':
vf_(no)format: switch to an AVOptions-based system.
af_aformat: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_aformat.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 13:59:45 +02:00
d2752ef061
lavfi/overlay: add process_command callback
2013-04-10 13:11:27 +02:00
006e20bd36
lavfi/overlay: add enable expression
...
This expression is useful to enable/disable overlaying on the fly.
Note that this can't be easily done relying on the filtergraph structure,
since this implies caching issues or a null frame overlaying in the best
case, which is better avoided for performance and convenience reasons.
2013-04-10 13:11:27 +02:00
cc3edd99a6
lavfi/overlay: add dynamic expression evaluation support
...
Add support for dynamic x, y expressions evaluation.
Also add support for an evaluation mode which allows to disable per-frame
evaluation, so that there is no speedloss in case the expression does not
depend on frame variables.
2013-04-10 13:11:27 +02:00
0594ef0dea
Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'
...
* commit 'b439c992c23f3e0f3832fffd2a34a664b236c525':
lavfi: switch to an AVOptions-based system.
dfa: implement missing TDLT coding method
Conflicts:
libavcodec/dfa.c
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 12:41:06 +02:00
2a7f885fe1
lavf: add libquvi demuxer.
2013-04-10 12:09:20 +02:00
d0073c7a0b
separatefields filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-10 00:08:57 +00:00
cdac3acb11
lavfi: add a bump and docs entries for the AVOptions switch
2013-04-09 19:13:27 +02:00
7b3eb745b9
vsrc_testsrc: switch to an AVOptions-based system.
2013-04-09 19:12:06 +02:00
a42d6e6c4c
vsrc_movie: switch to an AVOptions-based system.
2013-04-09 19:11:27 +02:00
7bc1a883c9
vsrc_color: switch to an AVOptions-based system.
2013-04-09 19:11:03 +02:00
dd7fc37c71
af_join: switch to an AVOptions-based system.
...
Change the mappings separator from comma to '|' to avoid excessive
escaping, since comma is already used for separating filters in the
filtergraph description.
2013-04-09 19:10:12 +02:00
ba8efac977
af_channelmap: switch to an AVOptions-based system.
2013-04-09 19:09:40 +02:00
7536c67104
vf_yadif: switch to an AVOptions-based system.
2013-04-09 19:09:03 +02:00
b83e9efc53
vf_unsharp: switch to an AVOptions-based system.
2013-04-09 19:08:42 +02:00
0c2466dec7
vf_transpose: switch to an AVOptions-based system.
2013-04-09 19:08:04 +02:00
ffea3b00c3
vf_settb: switch to an AVOptions-based system.
2013-04-09 19:07:44 +02:00
33b97faaba
vf_setpts: switch to an AVOptions-based system.
2013-04-09 19:07:28 +02:00
95f1f56a21
vf_select: switch to an AVOptions-based system.
2013-04-09 19:06:51 +02:00
40c885c589
vf_pad: switch to an AVOptions-based system.
2013-04-09 19:06:29 +02:00
9087eaf193
vf_overlay: switch to an AVOptions-based system.
2013-04-09 19:06:13 +02:00
20b46f8f4f
vf_lut: switch to an AVOptions-based system.
2013-04-09 19:05:32 +02:00
ee0e8d4b15
vf_libopencv: switch to an AVOptions-based system.
2013-04-09 19:05:22 +02:00
8c747d46f7
vf_hqdn3d: switch to an AVOptions-based system.
2013-04-09 19:05:12 +02:00
7ed833d78e
vf_gradfun: switch to an AVOptions-based system.
2013-04-09 19:04:57 +02:00
c334c113d4
vf_scale: switch to an AVOptions-based system.
2013-04-09 19:04:45 +02:00
5aa1a668cf
vf_frei0r: switch to an AVOptions-based system.
2013-04-09 19:04:28 +02:00
a39c154049
vf_fieldorder: switch to an AVOptions-based system.
2013-04-09 19:03:56 +02:00
b9dfee9fa2
vf_fade: switch to an AVOptions-based system.
2013-04-09 19:03:43 +02:00
8ec464c61c
vf_drawtext: switch to an AVOptions-based system.
2013-04-09 19:03:23 +02:00
335c31293b
vf_drawbox: switch to an AVOptions-based system.
2013-04-09 19:03:08 +02:00
63e58c55c1
vf_delogo: switch to an AVOptions-based system.
2013-04-09 19:02:43 +02:00
460e7b4f6d
vf_cropdetect: switch to an AVOptions-based system.
2013-04-09 19:02:32 +02:00
fba0156af7
vf_crop: switch to an AVOptions-based system.
2013-04-09 19:00:54 +02:00
51def31dbe
vf_boxblur: switch to an AVOptions-based system.
2013-04-09 19:00:39 +02:00
62dcdb028c
vf_blackframe: switch to an AVOptions-based system.
2013-04-09 19:00:26 +02:00
2831b307e6
vf_aspect: switch to an AVOptions-based system.
2013-04-09 18:58:30 +02:00
e67a87eac8
vf_(no)format: switch to an AVOptions-based system.
2013-04-09 18:56:39 +02:00
0af7fe1f95
af_aformat: switch to an AVOptions-based system.
2013-04-09 18:55:45 +02:00
d28cb84989
buffersrc: switch to an AVOptions-based system.
2013-04-09 18:48:16 +02:00
b439c992c2
lavfi: switch to an AVOptions-based system.
2013-04-09 18:45:37 +02:00
0678c388ba
rtsp: add option to set the socket timeout of the lower protocol.
...
Fixes Ticket2294
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-08 17:45:13 +02:00
84bfa8beb7
Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'
...
* commit 'a862c7d3368241e72a465ab944afa38ea62a6640':
Integrate lcov/gcov into Libav
Conflicts:
Makefile
common.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 13:23:38 +02:00
7775992c65
doc/filters: fix main/over mismatch in movie examples
...
Found-By: littlebat <dashing.meng@gmail.com>
2013-04-06 00:54:46 +02:00
a862c7d336
Integrate lcov/gcov into Libav
...
The gcov/lcov are a common toolchain for visualizing code coverage with
the GNU/Toolchain. The documentation and implementation of this
integration was heavily inspired from the blog entry by Mike Melanson:
http://multimedia.cx/eggs/using-lcov-with-ffmpeg/
2013-04-05 18:55:11 +02:00
029cca6fb3
doc/filters: clarify example explanation
2013-04-05 12:47:10 +02:00
89d581f15e
doc/filters: fix old broken syntax of color source in overlay example
...
Found-By: littlebat <dashing.meng@gmail.com>
2013-04-05 12:47:10 +02:00
9b4d9d8795
doc: enable compilation of -all tool pages
...
In particular, add documentation configuration system, through the
doc/config.texi file.
Fix trac issue #2374 .
2013-04-05 10:11:57 +02:00
702e743827
doc: move ffmpeg-scaler.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
a6cd26fc93
doc: move ffmpeg-resampler.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
a7990287aa
doc: move ffmpeg-devices.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
2086c7e173
doc: move ffmpeg-formats.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
d5f3a0c221
doc: move ffmpeg-codecs.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
c430eb2d58
doc/filters: fix erroneously truncated comment on a scale example
2013-04-05 01:18:06 +02:00
e80bc76e9e
doc/filters: put separated geq variables in separate lines
...
Make clear that they are not aliases for the same variable.
2013-04-05 01:18:06 +02:00
0f8435c089
doc: document -v repeat
...
Thanks-to: Derek Buitenhuis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 23:36:57 +02:00
b1dea2c0d8
lavfi/blend: add N variable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 15:30:06 +00:00
e7389ed5d0
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
...
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:00:59 +02:00
d344b99954
doc/ffprobe: fix references in See Also section
2013-04-04 10:13:30 +02:00
36babfdc39
doc/fate.texi: fix typo
2013-04-03 21:07:15 +02:00
9cb25440b3
doc/filters: fix error in blend description
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 17:06:25 +00:00
bf65752848
aphaser filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 08:33:59 +00:00
9079359141
deshake opencl based on comments on 20130402 3rd
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-02 15:57:44 +02:00
7d05751581
doc: Grammar fixes for strem specifiers section
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
0cb2d32453
doc: Fix broken English in the common options description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
a034cdf49d
doc: Grammar fixes for stream selection
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
9db706206d
doc: Consistently use 'filtergraph'
...
We used to use 'filtergraph' or 'filter graph' randomly.
'filtergraph' was chosen due to having 57 occurrences in
the documentation, whereas 'filter graph' had only 19.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
9249b28e79
doc: Grammar fixes for FFmpeg's detailed description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
fe64b88950
doc: Consistently use 'frame rate' everywhere
...
We used to use 'framerate' or 'frame rate' randomly.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Michael Niedermayer
Nicolas George
Clément Bœsch
Paul B Mahol
Stefano Sabatini
Vittorio Giovara
Anton Khirnov
highgod0401
Matthieu Bouron
Reinhard Tartler
Derek Buitenhuis