Michael Niedermayer
9b595e86e3
avdevice/lavfi: add error checking for av_opt_set_int_list()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 20:39:07 +02:00
Michael Niedermayer
e87c1cdbb5
ffplay: replace opaque/params for buffersinks
...
This fixes a regression caused by droping opaque.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 20:39:07 +02:00
Paul B Mahol
047a027d0b
lavfi/hue: copy alpha plane too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-12 18:32:46 +00:00
Clément Bœsch
72ad0d56a1
lavfi/hue: make do while (0) form meaningful.
2013-04-12 20:10:58 +02:00
Stefano Sabatini
9fa3b5b8a8
lavfi/crop: log pos in debug message
2013-04-12 19:16:28 +02:00
Stefano Sabatini
1d86fe6970
lavfi/crop: restore pos constant, and fix "t" variable misplacement in variable array
...
Fix evaluation of expressions containing the t variable.
2013-04-12 19:15:06 +02:00
Stefano Sabatini
9ae9ae10f9
doc/utils: apply misc fixes to OpenCL docs
2013-04-12 18:21:57 +02:00
Stefano Sabatini
949c8627b6
doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi
2013-04-12 18:21:57 +02:00
Stefano Sabatini
b59aa00707
doc/libavutil: remove include of opencl.texi
...
This is inconsistent with the rest of the docs.
2013-04-12 18:21:57 +02:00
Michael Niedermayer
227b4458fb
vf_interlace: fix frame rate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 16:40:35 +02:00
Michael Niedermayer
ebbd4fd5f0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
FATE: add a test for the interlace filter
lavfi: new interlace filter
Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 16:32:33 +02:00
Michael Niedermayer
7e68491367
Merge commit '921046008f5335601f9d76dc3a768eb5cd91e1b9'
...
* commit '921046008f5335601f9d76dc3a768eb5cd91e1b9':
cmdutils: allow -h filter=<name> to print information about a filter.
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 16:16:21 +02:00
Michael Niedermayer
608d86013a
Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'
...
* commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6':
avtools: move media_type_string() from avprobe to cmdutils.
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:56:20 +02:00
Michael Niedermayer
3dedcef8b8
avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:47:16 +02:00
Michael Niedermayer
1007de7033
asetpts: add AVOptions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:46:52 +02:00
Michael Niedermayer
292f68154b
avfilter: Filter options that are used for both video and audio should have both flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:45:28 +02:00
Michael Niedermayer
f81a8e89a1
Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'
...
* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0':
avconv: print filter options in -h full output.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:33:37 +02:00
Michael Niedermayer
7b6c0bda9e
Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'
...
* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb':
avconv: update to the new options syntax.
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 15:19:32 +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
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
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
Clément Bœsch
6b5ec76283
lavfi: fix forgotten chunk in eb0f774d
.
2013-04-12 14:08:04 +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
3fc7b47145
buffersink: switch from opaque to AVOptions for params
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 13:47:40 +02:00
Michael Niedermayer
a1e7e02eaf
abuffersink: switch from opaque to AVOptions for params
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 13:38:00 +02:00
Clément Bœsch
f16a6f667c
lavfi/ocv: fix crash with no dilate arguments.
2013-04-12 13:01:17 +02:00
Clément Bœsch
490786c02e
lavfi/ocv: fix crash with no filter name specified.
2013-04-12 12:44:23 +02:00
Clément Bœsch
51e71d6e11
lavfi/ocv: fix build after fd6228e65
.
2013-04-12 12:37:33 +02:00
Michael Niedermayer
4a88989254
buffersink: remove shorthand
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:25: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
Nicolas George
62d888ef0e
ffmpeg: use options for abuffersink.
...
Also remove unused buffersink_params.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:11:10 +02:00
Nicolas George
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
Nicolas George
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
Michael Niedermayer
3d7d819aad
avfilter/asrc_aevalsrc: fix return code, 2nd try
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 12:02:06 +02:00
Michael Niedermayer
fd6228e657
lavfi: remove now unused args parameter from AVFilter.init and init_opaque
...
This is mostly automated global search and replace
The deprecated aconvert filter is disabled, if it still has users
it should be updated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 11:54:39 +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
491d261ade
avfilter/asrc_aevalsrc: check correct variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 11:54:39 +02:00
Clément Bœsch
dee2db523d
doc/filters: update volume options description.
2013-04-12 11:51:54 +02:00
Paul B Mahol
ae8d435ba8
doc/filters: add quick emboss example
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-12 09:47:41 +00: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
Clément Bœsch
9c5f392cbc
doc/cropdetect: update boxblur options description.
2013-04-12 10:59:05 +02:00
Clément Bœsch
9811b7942d
doc/crop: update boxblur options description.
2013-04-12 10:59:05 +02:00
Clément Bœsch
fc15ad408c
doc/filters: update boxblur options description.
2013-04-12 10:59:05 +02:00
Clément Bœsch
8876b0816d
doc/filters: update blackframe options description.
2013-04-12 10:59:05 +02:00
Michael Niedermayer
80116b6e67
af_pan: avoid spaces before % to avoid possible issues with MSVC
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 10:52:55 +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
Серж Нискородов
9470b541e5
af_pan: fix parsing arguments from the example in the documentation
...
pan=stereo: FL < FL + 0.5*FC + 0.6*BL + 0.6*SL : FR < FR + 0.5*FC +
0.6*BR + 0.6*SR
didn't actually work ('Expected out channel name, got " FL < FL"')
2013-04-12 10:02:01 +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