Matthieu Bouron
0c59d40ae0
lavfi: use a video frame pool for each link of the filtergraph
2015-12-15 10:35:41 +01:00
Hendrik Leppkes
0b73d0ff0d
Merge commit '48ff6683ba5d40b629428673b1028e8ec542a9fa'
...
* commit '48ff6683ba5d40b629428673b1028e8ec542a9fa':
lavfi: add a frame_rate field to AVFilterLink.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-11-11 14:47:29 +01:00
Nicolas George
48ff6683ba
lavfi: add a frame_rate field to AVFilterLink.
...
(cherry picked from ffmpeg commit 7b42036b3b
)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-11-09 08:09:34 +01:00
Timothy Gu
87d5509261
avfilter: Reindent
2015-10-26 23:24:18 -07:00
Michael Niedermayer
377883c4be
avfilter/avfilter: Error out if audio parameters change instead of failing an assert
...
Filters which support such changes should be excluded from these checks
Fixes Ticket4884
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-16 15:25:09 +02:00
Nicolas George
44f660e7e7
lavfi: remove FF_LINK_FLAG_REQUEST_LOOP.
...
It has no longer any effect.
2015-09-20 19:02:33 +02:00
Nicolas George
2a351f6c55
lavfi: drop the requirement that request_frame returns a frame.
...
It requires a loop in filters or the framework,
that makes the scheduling less efficient and more complex.
This is purely an internal change since the loop is now
present in buffersink.
Note that no filter except buffersink did rely on the requirement.
2015-09-20 19:02:33 +02:00
Hendrik Leppkes
43e2e172df
Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1'
...
* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1':
lavfi: Drop deprecated *_count suffixed variables
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-05 16:11:22 +02:00
Hendrik Leppkes
2751d5f0ba
Merge commit '86e5056575f55f070609dd3926605302f7d2280e'
...
* commit '86e5056575f55f070609dd3926605302f7d2280e':
lavfi: Drop deprecated public AVFilterPad struct
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-05 16:01:24 +02:00
Michael Niedermayer
5d859e5980
avfilter/avfilter: Add a few more basic filters to the list which support frame size changes
...
Fixes assertion failures
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-05 11:43:27 +02:00
Vittorio Giovara
e65e4cbbda
lavfi: Drop deprecated *_count suffixed variables
...
Deprecated in 06/2012.
2015-08-28 16:01:13 +02:00
Ronald S. Bultje
6495c4c687
lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.
2015-08-18 22:22:49 -04:00
Ronald S. Bultje
ad7d972e08
lavfi: add error message to help users convert to new lavfi syntax.
2015-08-18 10:18:43 -04:00
Andreas Cadhalpun
13b3462b7a
avfilter: add missing FF_API_AVFILTERPAD_PUBLIC guard
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-12 00:14:13 +02:00
Andreas Cadhalpun
8bd74aafe8
avfilter: remove obsolete function declarations
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-08 21:58:48 +02:00
Vittorio Giovara
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
2015-04-19 12:41:59 +01:00
Michael Niedermayer
f455c8fdef
Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'
...
* commit '88b160a457e491cb9e014630ef5387ad3500258e':
avfilter: Return more meaningful error codes
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06 01:16:47 +01:00
Himangi Saraogi
88b160a457
avfilter: Return more meaningful error codes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-03-05 19:36:39 +01:00
Michael Niedermayer
b288f67434
avfilter/avfilter: Remove CONFIG_MP_FILTER case
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 13:47:17 +01:00
Michael Niedermayer
6c702c3c63
avfilter/avfilter: allow idet like scale to have parameter changes
...
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 06:03:57 +01:00
Michael Niedermayer
649c158e8c
Add FFMPEG_VERSION into the binary libs
...
This simplifies identifying from which revision a binary of a lib came from
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 19:32:40 +01:00
Michael Niedermayer
1945db1f13
Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'
...
* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
avfilter: check filter link validity
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25 03:08:19 +02:00
Vittorio Giovara
ac84c1ce24
avfilter: check filter link validity
...
Remove now redundant check.
CC: libav-stable@libav.org
Bug-Id: CID 700371
2014-10-24 23:42:19 +01:00
Clément Bœsch
abaf4245a1
avfilter: add w/h parameters in timeline
...
Fixes Ticket #4008 .
2014-10-07 15:05:50 +02:00
Michael Niedermayer
d9ddbaa924
avfilter/avfilter: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19 19:42:46 +02:00
Michael Niedermayer
b76059058a
Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'
...
* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
lavfi: use the correct filter context for logging an error.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 12:38:09 +01:00
Anton Khirnov
bba2a7cc5f
lavfi: use the correct filter context for logging an error.
2014-03-05 21:52:02 +01:00
Michael Niedermayer
41003da94a
avfilter/avfilter: fix use of uninitialized pointer
...
Fixes CID1163852
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-24 04:14:52 +01:00
Michael Niedermayer
d9481dcd61
Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'
...
* commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24':
avfilter: fix leaks on error in ff_filter_frame
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10 03:46:28 +01:00
Vittorio Giovara
abb5e37f64
avfilter: fix leaks on error in ff_filter_frame
2014-01-09 23:13:05 +01:00
Michael Niedermayer
c0a33c4770
avfilter: avfilter_register() that works in O(1) time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09 00:53:04 +01:00
Michael Niedermayer
133fbfc781
do O(1) instead of O(n) atomic operations in register functions
...
about 1ms faster startup time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06 15:27:36 +01:00
Michael Niedermayer
a1ce060c51
Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'
...
* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
avfilter: have avfilter_get_by_name return const for next bump
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 13:07:05 +01:00
Vittorio Giovara
884c7a6eb8
avfilter: fix const use of avfilter_next
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-28 07:58:23 +01:00
Vittorio Giovara
5c439b41d0
avfilter: have avfilter_get_by_name return const for next bump
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-28 07:57:44 +01:00
Michael Niedermayer
ab2bfb85d4
avfilter/ff_insert_pad: fix order of operations
...
Fixes out of bounds access
Fixes CID732170
Fixes CID732169
No filter is known to use this function in a way so the issue can be reproduced.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-21 16:43:25 +02:00
Michael Niedermayer
8780f7fbfa
avfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE
...
Fixes Ticket3015
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-09 16:33:18 +02:00
Michael Niedermayer
7381d31f22
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: allow user-provided execute() callbacks
Conflicts:
libavfilter/avfilter.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-28 11:02:01 +02:00
Anton Khirnov
0767bfd199
lavfi: allow user-provided execute() callbacks
2013-09-28 08:06:19 +02:00
Michael Niedermayer
4bc7a2a64b
avfilter: remove duplicate includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21 15:36:33 +02:00
Michael Niedermayer
3dfc5f551f
avfilter: avoid testing float == 0
...
This fixes the hypothetical case of rounding errors causing
incorrect values to be used.
We do not use *_EPSILON, because non trivial expressions can contain
errors larger than that making a zero equality test with *_EPSILON
unreliable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15 15:33:39 +02:00
Paul B Mahol
211a185cba
avfilter/avfilter: check allocation failure in ff_insert_pad()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-15 11:09:23 +00:00
Michael Niedermayer
bb23bf8fd7
avfilter/avfilter: fix null pointer dereference with queued ping filters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10 13:39:57 +02:00
Michael Niedermayer
20be5e0a0e
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
...
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 10:08:30 +02:00
Michael Niedermayer
a8e963835a
Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
...
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
Give less generic names to global library option arrays
Conflicts:
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 09:16:36 +02:00
Diego Biurrun
7950e519bb
Disable deprecation warnings for cases where a replacement is available
2013-08-02 19:19:02 +02:00
Diego Biurrun
b5a138652f
Give less generic names to global library option arrays
2013-08-02 19:19:02 +02:00
Michael Niedermayer
2236456715
avfilter/avfilter: Make avfilter_register() thread safe
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28 12:44:03 +02:00
Michael Niedermayer
3ed56b3b39
avfilter/process_options: fix memleak
...
Fixes CID1026765
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 15:26:50 +02:00
Michael Niedermayer
a2abd58a09
avfilter: remove av_opt_set_defaults() from process_options()
...
This is already called from ff_filter_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 15:25:52 +02:00
Michael Niedermayer
8d4e969afe
Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'
...
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
lavfi: add a slice threading infrastructure
Conflicts:
Changelog
cmdutils.c
doc/APIchanges
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 14:07:00 +02:00
Anton Khirnov
129bb23843
lavfi: add a slice threading infrastructure
...
Mostly based on libavcodec's
2013-05-24 09:28:18 +02:00
Michael Niedermayer
849bb62c2c
Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'
...
* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
prores: decode alpha plane when it's present
avfilter: check a malloc in avfilter_link().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:41:47 +02:00
Michael Niedermayer
d56ced5fbf
Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'
...
* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
avfilter.c: cosmetics, reformat
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:36:49 +02:00
Michael Niedermayer
fb8dde37e4
Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'
...
* commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6':
lavfi: factorize freeing a link
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:10:57 +02:00
Anton Khirnov
7e2b15c094
avfilter: check a malloc in avfilter_link().
...
Additionally change sizeof(type) into sizeof(var)
2013-05-17 20:32:27 +02:00
Anton Khirnov
bf5b5d2b15
avfilter.c: cosmetics, reformat
2013-05-17 20:32:18 +02:00
Anton Khirnov
d79bd60405
lavfi: factorize freeing a link
2013-05-17 20:30:25 +02:00
Clément Bœsch
d94c907008
lavfi: silence a discarded const qualifier warning.
2013-05-16 18:38:10 +02:00
Diego Biurrun
2832ea26f3
Remove commented-out debug #define cruft
2013-05-16 00:23:30 +02:00
Anton Khirnov
ffba2053ed
lavfi: fix compatibility code for old vf_scale options syntax
...
Currently it would incorrectly trigger on a string that contains a '='
but does not contain a ':', e.g. flags=<flags>.
2013-05-15 07:46:04 +02:00
Clément Bœsch
1776177b7f
lavfi: replace passthrough_filter_frame with a flag.
...
With the introduction of AVFilterContext->is_disabled, we can simplify
the custom passthrough mode in filters.
This commit is technically a small compat break, but the timeline was
introduced very recently.
Doxy by Stefano Sabatini.
2013-05-12 13:07:47 +02:00
Michael Niedermayer
e4723a82f7
avfilter: fix 2 warnings about discarding const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 23:55:06 +02:00
Michael Niedermayer
df9f9caba5
avfilter: Make enabled/disabled state available as a field of the AVFilterContext
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 23:55:06 +02:00
Clément Bœsch
38853169ce
lavfi: add 'enable' command injection to filters supporting timeline.
2013-04-23 01:02:28 +02:00
Clément Bœsch
fdd93eabfb
lavfi: add timeline support.
...
Flag added in a few simple filters. A bunch of other filters can likely
use the feature as well.
2013-04-23 01:02:27 +02:00
Clément Bœsch
b8a5c76131
lavfi: add frame counter into AVFilterLink and use it in filters.
2013-04-23 01:02:27 +02:00
Clément Bœsch
dcea58502c
lavfi: drop now unused shorthand field from AVFilter.
2013-04-13 00:45:30 +02:00
Michael Niedermayer
9a91c67478
Merge commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee'
...
* commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee':
lavfi: do not segfault on NULL passed to avfilter_get_by_name()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:14:08 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
0acf7e268b
avfilter: remove opaque passing hacks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 13:56:03 +02:00
Michael Niedermayer
f1e62af0e0
avfilter: remove mixed args hack for scale.
...
Our option handling code does not need this hack.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:19:48 +02:00
Anton Khirnov
d69a4177b9
lavfi: remove now unused args parameter from AVFilter.init
...
Conflicts:
libavfilter/avfilter.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vsrc_color.c
libavfilter/vsrc_movie.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 11:54:39 +02:00
Michael Niedermayer
04924bc923
avfilter: remove old shorthand system
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 10:59:12 +02:00
Michael Niedermayer
3c821e7550
af_pan: switch to an AVOptions-based shorthand system.
...
TODO: The first argument can be seperated into its own AVOption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 10:35:45 +02:00
Michael Niedermayer
c378ba19b5
abuffer: switch to an AVOptions-based shorthand system.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 09:55:01 +02:00
Michael Niedermayer
16e5e13c7e
buffersrc: switch to an AVOptions-based shorthand system.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 09:53:09 +02:00
Pavel Koshevoy
8f3c440a39
lavfi/atempo: switch to an AVOptions-based system.
...
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 09:31:33 +02:00
Michael Niedermayer
9ab796127a
avfilter: Update scale to dictionary based options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 02:34:40 +02:00
Michael Niedermayer
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
Michael Niedermayer
eb0f774d4b
Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'
...
* commit '1565cbc65cbb9f95c11367314a080068895e0cf0':
lavfi: make avfilter_free() remove the filter from its graph.
Conflicts:
libavfilter/avfilter.c
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 00:54:05 +02:00
Michael Niedermayer
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
Michael Niedermayer
9f3ae7aafd
Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'
...
* commit '4a37d4b3f8137a4c2bbbca043de076af966b9446':
lavfi: add const to the pads parameter of avfilter_pad_get_name/type
lavfi: add const to AVFilterContext.filter.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 23:31:01 +02:00
Clément Bœsch
838d803155
lavfi/mp: switch to an AVOptions-based system.
2013-04-11 23:27:12 +02:00
Clément Bœsch
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
Clément Bœsch
71ef1ec7b4
lavfi/aspect: switch to an AVOptions-based system.
...
This is heavily based on 2831b307
by Anton Khirnov <anton@khirnov.net>
2013-04-11 22:05:03 +02:00
Stefano Sabatini
976e3439ed
lavfi/flite: switch to AVOption-based system
2013-04-11 21:37:48 +02:00
Stefano Sabatini
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
Anton Khirnov
f160c6a18a
lavfi: do not segfault on NULL passed to avfilter_get_by_name()
2013-04-11 20:44:35 +02:00
Anton Khirnov
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
Anton Khirnov
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
Michael Niedermayer
4f43e9b4af
avfilter/aresample: use init_dict system and set child AVOption context correctly
...
Parts of this commit are based on: 4fa1f52e
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 20:40:59 +02:00
Michael Niedermayer
f6bfeef7fa
avfilter: fix handing of child context options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 20:40:30 +02:00
Anton Khirnov
1ba95a9cca
lavfi: add avfilter_init_dict() for initializing a filter with a dict.
2013-04-11 20:40:20 +02:00
Anton Khirnov
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
Anton Khirnov
1565cbc65c
lavfi: make avfilter_free() remove the filter from its graph.
2013-04-11 20:38:48 +02:00
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
Michael Niedermayer
1c3cdf533b
Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'
...
* commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd':
vf_cropdetect: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_cropdetect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 17:36:29 +02:00
Michael Niedermayer
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