generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
54,912 Commits 24 Branches 241 Tags 173 MiB
da0f67b177
Commit Graph

486 Commits

Author SHA1 Message Date
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