generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56,901 Commits 24 Branches 241 Tags
Commit Graph

4156 Commits

Author SHA1 Message Date
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
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
Michael Niedermayer
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
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
Stefano Sabatini
fdedfc029b doc/filters: rework Commands section for overlay filter 2013-04-12 00:18:39 +02:00
Stefano Sabatini
b2e22731e4 doc/filters: apply minor fixes to hue Commands section 2013-04-12 00:18:32 +02:00
Stefano Sabatini
ed2c827575 lavfi/overlay: add repeatlast option 2013-04-12 00:09:19 +02:00
Michael Niedermayer
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
Clément Bœsch
9110f95985 doc/filters: use -af and -filter_complex instead of amovie for two examples. 2013-04-11 23:47:12 +02:00
Michael Niedermayer
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
Stefano Sabatini
d980641ec4 doc/filters: fix fade-out hue saturation expression in sendcmd example 2013-04-11 23:03:18 +02:00
Stefano Sabatini
9ad27cd447 doc/filters: update hue command syntax after recent update 2013-04-11 23:03:18 +02:00
Michael Niedermayer
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
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
Michael Niedermayer
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
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
Vittorio Giovara
3fce136798 lavfi: new interlace filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-04-11 21:33:07 +02:00
Anton Khirnov
921046008f cmdutils: allow -h filter=<name> to print information about a filter. 2013-04-11 20:46:11 +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
Anton Khirnov
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
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
111367263a lavfi: add AVFilterContext.graph. 
It will be useful in the following commits.
 2013-04-11 20:38:23 +02:00
Anton Khirnov
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
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
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
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
64ce15b9f4 lavfi/aevalsrc: switch to an AVOptions-based system. 2013-04-11 17:28:02 +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
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
3c2e4c2a9b lavfi/showwaves: switch to an AVOptions-based system. 2013-04-11 14:18:44 +02:00
Michael Niedermayer
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
Paul B Mahol
661e284b4a telecine filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-11 11:12:39 +00:00
Nicolas George
0d58bbb28d lavfi/buffersrc: update for compatibility with the fork. 
Merge and adapt commit d28cb84 by Anton Khirnov.
 2013-04-11 13:09:10 +02:00
Clément Bœsch
7e7dc1489f lavfi/curves: make possible to customize presets. 2013-04-11 13:05:06 +02:00
Michael Niedermayer
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
highgod0401
9d442b9cc0 opencl: add spec opencl device APIs 20130411 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 12:46:34 +02:00
Anton Khirnov
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
Clément Bœsch
4c9b031559 lavfi/smartblur: cleanup unused shorthand and doc. 2013-04-11 12:41:13 +02:00
Clément Bœsch
3417280b57 lavfi/field: cleanup unused shorthand and doc. 2013-04-11 12:41:13 +02:00
Anton Khirnov
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
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