Anton Khirnov
4753f802c0
vf_libopencv: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:35:53 +02:00
Anton Khirnov
56e4ce0d13
vf_hqdn3d: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:35:48 +02:00
Anton Khirnov
7af5ae2d07
vf_hflip: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:38 +02:00
Anton Khirnov
05fab5530b
vf_gradfun: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:29 +02:00
Anton Khirnov
f6b6d6ac42
vf_frei0r: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:23 +02:00
Anton Khirnov
cbec213a90
vf_format: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:17 +02:00
Anton Khirnov
d64cf54b34
vf_fieldorder: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:07 +02:00
Anton Khirnov
9bbf6c681a
vf_fieldorder: cosmetics, remove an extra linebreak
2013-05-16 07:32:49 +02:00
Anton Khirnov
c0279956b3
vf_fade: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:32:43 +02:00
Anton Khirnov
d3735f7ad6
vf_drawtext: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:32:34 +02:00
Anton Khirnov
20e2794eea
vf_drawbox: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:32:27 +02:00
Anton Khirnov
ba09675f44
vf_delogo: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:31:57 +02:00
Anton Khirnov
e16e23d70e
vf_cropdetect: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:31:50 +02:00
Anton Khirnov
671563d9fd
vf_crop: cosmetics, break lines
2013-05-16 07:31:31 +02:00
Anton Khirnov
7f83959598
vf_crop: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:31:11 +02:00
Anton Khirnov
762df56ef9
vf_boxblur: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:30:56 +02:00
Anton Khirnov
a2a696990c
vf_blackframe: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:30:41 +02:00
Anton Khirnov
b3ea76624a
vf_aspect: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:30:28 +02:00
Clément Bœsch
d686517ad1
lavfi/mp: remove mp=ow wrapper.
...
Filter ported natively as owdenoise.
2013-05-16 00:45:45 +02:00
Clément Bœsch
b1e84efa3d
lavfi: port wavelet denoiser filter from libmpcodecs.
2013-05-16 00:45:45 +02:00
Diego Biurrun
2832ea26f3
Remove commented-out debug #define cruft
2013-05-16 00:23:30 +02:00
Paul B Mahol
c45b823bf8
lavfi/histogram: logarithmic mode for levels
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-15 12:38:39 +00:00
Michael Niedermayer
c7c71f95f8
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:23:14 +02:00
Michael Niedermayer
ff4680922f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:10:09 +02:00
Michael Niedermayer
aa6454e6ca
Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'
...
* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
avfiltergraph: simplify inserting conversion filters.
Clarify output of av_get_bits_per_pixel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 10:21:16 +02:00
Anton Khirnov
e6c4ac7b5f
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
2013-05-15 07:46:51 +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
Anton Khirnov
096696ef0d
avfiltergraph: simplify inserting conversion filters.
...
There is now no need to explicitly pass 0:0 as width/height to scale,
those are the defaults.
2013-05-15 07:45:51 +02:00
Clément Bœsch
bc1c90eabf
lavfi/dctdnoiz: fix 10l typo in pr_height computation.
2013-05-15 03:19:49 +02:00
Clément Bœsch
7b43120c7c
lavfi: add dctdnoiz filter.
2013-05-15 00:54:00 +02:00
Michael Niedermayer
640e524ff6
libavfilter/Makefile: unbreak make alltools
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 21:58:56 +02:00
Stefano Sabatini
2a1b7dee6d
tools: add zmqsend tool, useful to test the zmq filters
2013-05-14 20:10:55 +02:00
Stefano Sabatini
7ddb0ef9af
lavfi: add zmq filters
2013-05-14 20:10:44 +02:00
Paul B Mahol
b24530019f
lavfi/blend: timeline support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-14 17:41:50 +00:00
Paul B Mahol
811b17fbad
lavfi: cosmetics: fix vertical alignment for pads in some filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-14 15:31:56 +00:00
Michael Niedermayer
6b13f54262
vf_colorchannelmixer: round lut entries to nearest
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 12:51:22 +02:00
James Darnley
d10499a32a
yadif: correct strides in filter_edges_16bit
...
The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-14 09:24:13 +02:00
James Darnley
b0ef0ae776
yadif: restore speed of the C filtering code
...
Always use the special filter for the first and last 3 columns (only).
Changes made in 64ed397
slowed the filter to just under 3/4 of what it
was. This commit restores the speed while maintaining identical output.
For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-14 09:23:55 +02:00
Andrey Utkin
47a628bfb3
avfilter: Add 'drawgrid' video filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 21:34:15 +02:00
Clément Bœsch
0122300c86
lavfi/hqdn3d: restore timeline feature.
2013-05-12 13:07:47 +02:00
Clément Bœsch
0652111833
lavfi/hqdn3d: use macros instead of hardcoded indexes.
2013-05-12 13:07:47 +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
Clément Bœsch
60f0e30431
lavfi/vflip: use FF_CEIL_RSHIFT for chroma w/h rounding.
2013-05-12 12:59:00 +02:00
Clément Bœsch
59d33eafd1
lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding.
2013-05-12 12:59:00 +02:00
Paul B Mahol
91cae60ecb
lavfi/select: unbreak compatibility with older PICT_TYPE syntax
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 10:52:26 +00:00
Michael Niedermayer
44f69c0df8
avfilter/af_astats: fix 64bit printf type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 19:10:39 +02:00
Michael Niedermayer
bb0d3a4393
avfilter/vf_mp: remove unused function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 19:08:42 +02:00
Michael Niedermayer
efaa2e01e6
vf_copy: silence "incompatible pointer type" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 15:51:27 +02:00
Clément Bœsch
a9705e4de9
lavfi/curves: avoid ctx pointer indirection.
2013-05-10 23:47:28 +02:00
Michael Niedermayer
2a7d719848
Merge commit '16a4a18db089af8c432f1cdec62155000585b72c'
...
* commit '16a4a18db089af8c432f1cdec62155000585b72c':
af_asyncts: fix offset calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 23:03:50 +02:00
Paul B Mahol
4868855b13
lavfi/select: set forgotten VAR_PICT_TYPE_BI
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-10 17:39:09 +00:00
Paul B Mahol
005ee7a586
lavfi: avectorscope filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-10 17:11:54 +00:00
Clément Bœsch
50e66726a2
lavfi: use ceil right shift for chroma width/height.
...
This should fix several issues with odd dimensions inputs.
lut, vflip, pad and crop video filters also need to be checked for such
issues. It's possible sws is also affected.
2013-05-10 17:20:06 +02:00
Paul B Mahol
d751a2526f
lavfi/anull: remove redundant lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-10 15:08:12 +00:00
highgod0401
63e8fc4d8f
lavfi: modify names of deshake_kernel.h and unsharp_kernel.h
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 12:44:04 +02:00
Stefano Sabatini
5c4c929878
lavfi/avfiltergraph: fix style
2013-05-10 10:33:00 +02:00
Stefano Sabatini
e1332ff324
lavfi/avfilter.h: fix typo
2013-05-10 10:33:00 +02:00
Anton Khirnov
16a4a18db0
af_asyncts: fix offset calculation
...
delta is in samples, not bytes. Also the sample format is not guaranteed
to be planar.
CC:libav-stable@libav.org
2013-05-10 09:31:27 +02:00
Clément Bœsch
4db84bac13
lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.
2013-05-09 16:59:43 +02:00
Clément Bœsch
f0250cc463
lavfi/overlay: simpler up-rounded w/h computations.
2013-05-09 16:59:43 +02:00
Clément Bœsch
570d63eef3
lavu: add FF_CEIL_RSHIFT and use it in various places.
2013-05-09 16:59:42 +02:00
Paul B Mahol
88e0e2054d
lavfi: remove alphaextract special code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-09 14:53:21 +00:00
Michael Niedermayer
696f5f98e2
Merge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e'
...
* commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e':
x86: vf_yadif: Remove stray dsputil_mmx #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 11:51:40 +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
1e1015f330
avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE
...
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
Paul B Mahol
c4a5499d25
lavfi/extractplanes: packed rgb support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 19:28:30 +00:00
Paul B Mahol
8245520b88
lavfi/colorchannelmixer: remove now redudant code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 19:24:23 +00:00
Paul B Mahol
deef4b1ac9
lavfi/drawutils: add 16 bit rgb and planar rgb to ff_fill_rgba_map()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 19:24:23 +00:00
Diego Biurrun
6e9f8d6a7d
x86: vf_yadif: Remove stray dsputil_mmx #include
2013-05-08 18:18:23 +02:00
Paul B Mahol
8e2972274e
lavfi/null: remove redudant lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Paul B Mahol
94ff68ccb3
lavfi/lut: add support for YUVA422P and YUVA444P
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Paul B Mahol
1f2baec7bd
lavfi: add gbrap support to some filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Stefano Sabatini
ae0ce99ca4
lavfi/unsharp: use verbal form in help message options
2013-05-08 01:39:12 +02:00
Nicolas George
4582e4c086
lavfi: add comments to explain the negotiation loop.
2013-05-07 18:40:51 +02:00
Nicolas George
78d16b6a51
lavfi: fix filter format negotiation loop.
...
query_formats() returning EAGAIN is not considered a progress
in the format negotiation.
If the filter returns EAGAIN but did set some of its formats
lists, it could be considered a partial success and counted
as progress in the negotiation. Not counting it is not a
problem because it currently only happens in the first round,
where there will always be some progress on the other filters.
2013-05-07 18:40:51 +02:00
Clément Bœsch
d3f7b98f87
lavfi/overlay: reindent fix.
2013-05-07 15:43:28 +02:00
Clément Bœsch
5043d8d213
lavfi/alphaextract: copy width and not linesize.
...
Padding data is not supposed to be copied.
2013-05-07 15:33:49 +02:00
Michael Niedermayer
fe5b089596
Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
...
* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
vf_scale: add endianness conversion pixel format in query_formats
Conflicts:
libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 11:27:44 +02:00
Janne Grunau
5f87c277bd
vf_scale: add endianness conversion pixel format in query_formats
2013-05-06 21:48:15 +02:00
Michael Niedermayer
f4341c64be
avfilter: add av_cold to uninit()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:55:06 +02:00
highgod0401
b02f073ad4
lavfi/deshake_opencl: use ff_opencl_set_parameter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:30:22 +02:00
highgod0401
e215cb5e96
lavfi/unsharp_opencl: use av_opencl_errstr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 12:08:22 +02:00
highgod0401
9a09a9fc43
lavfi/unsharp: fix opencl crash on 64bit linux
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 11:45:40 +02:00
Michael Niedermayer
a1f234be11
make the ordering of the return type and av_cold consistent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:13:00 +02:00
Michael Niedermayer
e7f8493fd8
Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'
...
* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
lavfi: let gcc realign the stack on public graph driving functions
Conflicts:
libavfilter/buffersink.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:48:25 +02:00
Michael Niedermayer
a8ff830b79
Merge commit '093804a93cc5da3f95f98265a5df116912443cec'
...
* commit '093804a93cc5da3f95f98265a5df116912443cec':
avfilter: Add av_cold attributes to init/uninit functions
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 11:42:18 +02:00
Michael Niedermayer
adaa7743f5
src_movie: fix scanf string
...
Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 00:56:39 +02:00
Hendrik Leppkes
20c86571cc
lavfi: let gcc realign the stack on public graph driving functions
...
The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.
This fixes a crash in YADIF filter when using a mingw build in a MSVC
application.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-04 23:40:13 +03:00
Diego Biurrun
093804a93c
avfilter: Add av_cold attributes to init/uninit functions
2013-05-04 21:10:05 +02:00
Stefano Sabatini
f51aa92b0f
lavfi/testsrc: add support for color interactive command
2013-05-03 18:37:54 +02:00
Paul B Mahol
ce322f4c19
extractplanes filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-03 16:30:39 +00:00
Clément Bœsch
e85ea7d387
lavfi/frei0r: fix crash when parameters are not set.
2013-05-03 17:08:33 +02:00
Paul B Mahol
a64c9afe3d
lavfi/blend: merge config_input_top into config_output
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-02 12:22:18 +00:00
Paul B Mahol
990b13806d
lavfi/blend: use correct way to check number of planes
...
This fix crash with gray, as its marked as pseudopal,
and thus have extra plane.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-02 12:22:18 +00:00
Michael Niedermayer
1a94d7c7c8
avfilter/trim: improve rounding precission
...
Note, the design is still flawed, dont expect this to be frame
accurate. float/double first needs to be removed and frames
itself trimmed instead of drop vs nodrop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 13:55:30 +02:00
Michael Niedermayer
3319679d0a
Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
...
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
lavfi: add trim and atrim filters.
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 11:34:34 +02:00
Michael Niedermayer
1cba7fa364
Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'
...
* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
lavfi: add an asetpts filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_setpts.c
libavfilter/setpts.c
libavfilter/version.h
libavfilter/vf_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:59:21 +02:00
Michael Niedermayer
0061ba044a
Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'
...
* commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0':
vf_setpts: cosmetics, reformat
Conflicts:
libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:24:45 +02:00
Michael Niedermayer
e41d3aba01
Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'
...
* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
graphparser: only print filter arguments if they are non-NULL
af_channelmap: ensure the output channel layout is valid.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:16:31 +02:00
Michael Niedermayer
a1b8879714
Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'
...
* commit '949c603ed9210df0e1b8e1aa82c71b93543d8071':
af_channelmap: remove now unnecessary goto
vf_split: fix description
Conflicts:
libavfilter/split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:11:01 +02:00
Anton Khirnov
a1e05b0487
lavfi: add trim and atrim filters.
2013-04-30 11:24:57 +02:00
Anton Khirnov
b472938233
lavfi: add an asetpts filter
2013-04-30 11:17:57 +02:00
Anton Khirnov
2548834b22
vf_setpts: cosmetics, reformat
2013-04-30 11:17:23 +02:00
Anton Khirnov
c22263d3e8
graphparser: only print filter arguments if they are non-NULL
2013-04-30 11:16:57 +02:00
Anton Khirnov
8aaab1113c
af_channelmap: ensure the output channel layout is valid.
2013-04-30 11:16:37 +02:00
Anton Khirnov
949c603ed9
af_channelmap: remove now unnecessary goto
...
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.
2013-04-30 11:16:22 +02:00
Anton Khirnov
1012155722
vf_split: fix description
...
It now allows an arbitrary number of inputs, not just two.
2013-04-30 11:16:16 +02:00
Paul B Mahol
2bdd434931
lavfi/stereo3d: add support for alternating frames input & output format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 09:13:36 +00:00
Clément Bœsch
d558e46469
lavfi: add two opencl headers to SKIPHEADERS.
...
Fix make checkheaders.
2013-04-30 00:34:58 +02:00
Paul B Mahol
c645659988
lavfi/showwaves: fix crash in case of negative linesize
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-29 19:28:12 +00:00
Paul B Mahol
32d4641219
lavfi/showspectrum: fix crash in case of negative linesize
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-29 19:27:15 +00:00
Michael Niedermayer
e92862e75f
avfilter/vf_tinterlace: fix handling of not so even sizes
...
Fixes green bottom line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 12:26:15 +02:00
Stefano Sabatini
0400176772
lavfi/mp: remove mp=tinterlace wrapper
...
From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.
See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200
2013-04-28 13:16:40 +02:00
Stefano Sabatini
75070d9fa0
lavfi/transpose: apply grammar consistency fixes to transpose dir option
2013-04-28 13:16:40 +02:00
Stefano Sabatini
028c73358a
lavfi/transpose: reindent constants
2013-04-27 20:33:54 +02:00
Stefano Sabatini
d33c77b14a
lavfi/transpose: restore validity of values in range 4-7
...
They were lost in commit a4e0defa75
.
2013-04-27 20:33:48 +02:00
Paul B Mahol
cc5c155959
astats filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-27 12:40:34 +00:00
Paul B Mahol
785eb5fc57
lavfi/negate: unbreak negate alpha
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 23:45:24 +00:00
Clément Bœsch
039c2b7828
lavfi/hqdn3d: remove timeline flag.
...
The filter stores some temporal data, which needs to be done with the
passthrough callback system when timeline is enabled. Until then,
timeline support is disabled.
2013-04-26 21:27:02 +02:00
Paul B Mahol
6a8d05061f
lavfi/stereo3d: avoid division when changing aspect ratio
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 10:13:50 +00:00
Paul B Mahol
42d61fd968
lavfi/afade: fix AVOptions descriptions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 10:04:16 +00:00
Paul B Mahol
09250e3445
lavfi/curves: add support for more rgb formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 09:37:28 +00:00
Paul B Mahol
1a530f9ed8
lavfi: support timeline for colorbalance and colorchannelmixer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 09:37:28 +00:00
highgod0401
cd134963e8
lavfi/unsharp: add opencl unsharp filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 03:05:26 +02:00
Paul B Mahol
89b5ed5f15
lavfi/noise: remove get_video_buffer, its redundant now
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 17:05:42 +00:00
Paul B Mahol
e86ed98f43
lavfi/noise: add missing emms_c()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 17:01:40 +00:00
Paul B Mahol
00acfdd926
lavfi/telecine: show time base change too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 16:52:29 +00:00
Clément Bœsch
035a3792c2
lavfi/subtitles: zero-init AVSubtitle.
...
This avoids invalid free when the stream id doesn't match the packet
stream index.
Ticket #2501
2013-04-25 00:56:38 +02:00
Clément Bœsch
73050df240
lavfi: add timeline support in {de,remove}logo.
...
Both don't change anything in the context between frames.
2013-04-24 20:13:01 +02:00
Clément Bœsch
1f6aa7de3e
lavfi: add vidstabutils.h to SKIPHEADERS.
...
Fix checkheaders when vid.stab is not available.
2013-04-24 19:38:06 +02:00
Clément Bœsch
c7d2a3abf0
lavfi/vidstabdetect: fix direct path.
...
The frame must be writable if the show option is set, otherwise pass the
frame unchanged.
2013-04-24 18:30:43 +02:00
Clément Bœsch
c82f6e58da
lavfi/vidstab: remove mention of defaults for consistency with other filters.
2013-04-24 18:30:43 +02:00
Clément Bœsch
111ac10b60
lavfi/vidstab: make use of direct variable.
2013-04-24 18:30:42 +02:00
Clément Bœsch
9273cc8eb5
lavfi/vidstab: add missing flags for 2 options.
2013-04-24 18:30:42 +02:00
Clément Bœsch
cdc48775aa
lavfi/vidstab: consistent descriptions.
2013-04-24 18:30:42 +02:00
Clément Bœsch
017051266b
lavfi/vidstab: miscelenaous cosmetics and typo fixes.
2013-04-24 18:30:42 +02:00
Georg Martius
4364e1f150
lavfi: add video stabilization plugins using vid.stab library
...
vidstabdetect and vidstabtransform common functions for interfacing
vid.stab are in libavfilter/vidstabutils.c
Signed-off-by: Georg Martius <martius@mis.mpg.de>
2013-04-24 18:30:42 +02:00
Stefano Sabatini
638ffb2413
lavfi/hue: rework logic for setting commands
...
In particular, fix h/H commands in case h and H are not specified as
initial parameters.
2013-04-23 22:33:53 +02:00
Michael Niedermayer
8f04220df8
avfilter/geq: rgb support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 16:06:37 +02:00
Michael Niedermayer
0a73803c86
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: Move some conditional code around to avoid unused variable warnings
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 11:01:46 +02:00
Michael Niedermayer
a9a537b154
avfilter/drawtext: add pict_type support
...
Fixes Ticket2470
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 03:35:28 +02:00
Clément Bœsch
15d2f26998
lavfi/overlay: support timeline through the new system.
2013-04-23 01:02:28 +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
Diego Biurrun
c1ad70c3cb
x86: Move some conditional code around to avoid unused variable warnings
2013-04-22 17:50:02 +02:00
Paul B Mahol
2f11aa141a
lavfi: remove mp=down3dright
...
Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-22 11:49:13 +00:00
Michael Niedermayer
e4c0f258d3
Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'
...
* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
afifo: fix request_samples on the last frame in certain cases
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 13:02:29 +02:00
Anton Khirnov
9bfc6e02ba
afifo: fix request_samples on the last frame in certain cases
...
The current code can fail to return the last frame if it contains
exactly the requested number of samples.
Fixes the join filter test, which previously did not include the last
408 samples in most cases.
CC:libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-22 02:29:56 +02:00
Andy Martin
4ac2da3793
lavfi/fade: Added ability to do video fade based on timestamp
2013-04-21 20:57:02 +02:00
Stefano Sabatini
3e40b85683
lavfi: add interleave filters
2013-04-21 18:24:04 +02:00
Stefano Sabatini
df766673e5
lavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers
2013-04-21 17:27:32 +02:00
Stefano Sabatini
5e893df7ae
lavfi/sendcmd: fix various "in in" rerepepetitions in messages
2013-04-21 17:27:25 +02:00
Nicolas George
fd7a7e11b9
lavfi/buffersink: fix possible leaks after allocation failures.
...
Should fix Coverity CID 1005313, 1005314, 1005315.
2013-04-21 16:11:36 +02:00
Nicolas George
b57c23f8c8
lavfi: add asetrate filter.
2013-04-21 15:20:50 +02:00
Pavel Koshevoy
0c77cdb491
libavfilter/af_atempo: Avoid round-off error build-up, ticket #2484
...
Current method for constraining fragment position drift suffers from
round-off error build up.
Instead of calculating cumulative drift as a sum of input fragment
position corrections, it is more accurate to calculate drift as the
difference between current fragment position and the ideal position
specified by the tempo scale factor.
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 10:46:52 +02:00
Pavel Koshevoy
5a2a060378
libavfilter/af_atempo: Fix uninitialized memory access
...
valgrind reported uninitialized memory access which was caused by
incorrect number of samples being passed to push_samples(..)
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 10:45:57 +02:00
highgod0401
fdad04e756
avfilter/deshake_kernel: fix reset value bug of deshake kernel
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 19:55:58 +02:00
Paul B Mahol
a56fd051ee
lavfi/stereo3d: support more formats for non-anaglyph outputs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-20 17:45:54 +00:00
Clément Bœsch
380cfce2b2
lavc: add AV_CODEC_PROP_TEXT_SUB.
...
CC are not marked. Also allow potential mixed types later.
2013-04-19 13:15:54 +02:00
Paul B Mahol
b63f7b3ac7
lavfi/afade: use AV_OPT_TYPE_DURATION
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-19 00:56:55 +00:00
Michael Niedermayer
7254afdf1c
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
ffmpeg: make -aspect work with -vcodec copy.
lavfi/vf_aspect: improve compatibility of parsing.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 01:02:21 +02:00
Stefano Sabatini
c6a43a7244
lavfi/mptestsrc: fix invalid access in case of negative linesize
...
In particular, fix crash with:
ffplay -f lavfi mptestsrc,vflip
2013-04-18 23:47:44 +02:00
Nicolas George
b42827ffd9
lavfi/vf_aspect: improve compatibility of parsing.
...
Try to accept both the old "num:den" and the new "num/den"
syntax. Fix "aspect=2" being ignored due to a missing den.
Also remove a duplicated #include.
2013-04-18 20:51:55 +02:00
Paul B Mahol
212960eea4
colorchannelmixer filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-18 15:31:35 +00:00
Paul B Mahol
449cdd547b
colorbalance filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-18 15:30:10 +00:00
Stefano Sabatini
1efcab02b6
lavfi/aspect: apply hot fix for NUM:DEN syntax
2013-04-17 23:37:22 +02:00
Stefano Sabatini
f04ec05f0e
lavfi/setdar: fix num/den swapping in log message
2013-04-17 23:37:22 +02:00
Stefano Sabatini
f212c2380a
lavfi/setsar: remove spurious #if FF_API_OLD_FILTER_OPTS around init field
2013-04-17 23:37:05 +02:00
Stefano Sabatini
e252460c9b
lavfi/mptestsrc: remove unused size field
2013-04-17 22:40:08 +02:00
Stefano Sabatini
db84088e99
lavfi/mptestsrc: use AV_OPT_TYPE_DURATION
...
Simplify.
2013-04-17 22:40:02 +02:00
Stefano Sabatini
bbf003e949
lavfi/mptestsrc: reindent option constants
2013-04-17 22:39:51 +02:00
Stefano Sabatini
3933963d7b
lavfi/testsrc: fix style
2013-04-17 22:39:44 +02:00
Stefano Sabatini
7ab6312610
lavfi/testsrc: use int in place of unsigned
...
Avoid implicit int->unsigned conversion, causing invalid access in case
of negative linesize.
Fix crash with:
ffplay -f lavfi testsrc,vflip
2013-04-17 22:39:34 +02:00
Stefano Sabatini
5229b78371
lavfi/aspect: extend verbose feedback, show old SAR and DAR values
2013-04-17 22:39:26 +02:00
Stefano Sabatini
fe5ca6b913
lavfi/aspect: restore ratio parsing
...
Allow to set a ratio as "a:b" (with proper escaping), and correctly
honour the max parameter.
2013-04-17 22:39:20 +02:00
Stefano Sabatini
8bfd878151
lavfi/select: factorize options definition between select and aselect
2013-04-17 22:39:04 +02:00
Stefano Sabatini
dcc1b32361
lavfi/select: add support for dynamic number of outputs
2013-04-17 22:34:05 +02:00
Stefano Sabatini
565c50ac7b
lavfi/select: make select_frame() return void
...
Set select->select internally to the function, avoid lossy double->int
conversion causing spurious frame drop (e.g. in case the evaluation
result is positive and less than 1).
2013-04-17 22:28:56 +02:00
Michael Niedermayer
0b3bd78714
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/buffersrc: fix failed requests count.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 21:32:13 +02:00
Michael Niedermayer
45741dd81f
vf_lut: fix simplification / off by 1 error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 21:25:41 +02:00
Paul B Mahol
1de7dcb457
lavfi/stereo3d: fix interleave row output modes
...
Linesizes that did not match output width produced several artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 17:34:17 +00:00
Clément Bœsch
7ee2daed9b
lavfi/interlace: remove exec permissions.
2013-04-17 19:27:33 +02:00
Clément Bœsch
4c6fa4ef45
lavfi/lut: simplify nested component stepping.
2013-04-17 19:18:08 +02:00
Clément Bœsch
45f5bf917b
lavfi/lut: reindent after previous commit.
2013-04-17 19:18:08 +02:00
Clément Bœsch
3db3b278f2
lavfi/lut: add direct path.
2013-04-17 19:18:08 +02:00
Paul B Mahol
716588188d
lavfi/stereo3d: check input width & height
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 15:16:48 +00:00
Michael Niedermayer
f60ba6c524
Merge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347'
...
* commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347':
af_channelmap: cosmetics, use an extra local variable to shorten the code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 15:13:14 +02:00
Michael Niedermayer
74e86d3147
Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'
...
* commit 'aafed1175df76603e94c99a7748968780d6548d2':
af_channelmap: sanity check input channel indices in all cases.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 15:04:22 +02:00
Paul B Mahol
b725202546
lavfi/stereo3d: fix output width for sbsl/sbs2l
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 12:21:47 +00:00
Paul B Mahol
f0a149e538
lavfi: remove bad inverse telecine filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 11:51:16 +00:00
Nicolas George
e3e6aa7afb
lavfi/buffersrc: fix failed requests count.
...
The line was lost during the AVFrame transition.
It causes programs relying on the failed requests count,
especially ffmpeg, to add frames to the wrong input.
Fix trac ticket #2467 .
2013-04-17 11:32:03 +02:00
Anton Khirnov
c0771a1ac6
af_channelmap: cosmetics, use an extra local variable to shorten the code
2013-04-17 08:37:59 +02:00
Anton Khirnov
aafed1175d
af_channelmap: sanity check input channel indices in all cases.
...
Fixes invalid reads from non-existing channels.
CC:libav-stable@libav.org
2013-04-17 08:37:59 +02:00
Paul B Mahol
b8edf91657
lavfi/histeq: fix out of array write
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 00:24:16 +00:00
Paul B Mahol
295ce83e2f
lavfi/il: remove pointless store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 21:45:34 +00:00
Paul B Mahol
9bd1b1c1e7
lavfi/earwax: remove pointless store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 21:32:26 +00:00
Paul B Mahol
83253431b7
lavfi/stereo3d: remove pointless store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 21:07:21 +00:00
Stefano Sabatini
30926a1f1f
lavfi/aspect: fix weird copyright notice
2013-04-16 22:15:34 +02:00
Stefano Sabatini
ba32afd70e
lavfi/split: use AVFILTER_DEFINE_CLASS to define class
2013-04-16 22:15:24 +02:00
Paul B Mahol
65efa1dbd9
lavfi/interlace: remove now unused av_opt_free() call
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 14:32:49 +00:00
Stefano Sabatini
3453b0196f
lavfi/split: fix minor documentation issues
...
Use verbal form to describe "outputs" options, and mention it in the
manual.
2013-04-15 23:35:49 +02:00
Clément Bœsch
de656ea91e
lavfi/drawtext: make options array more readable.
2013-04-15 21:49:18 +02:00
Michael Niedermayer
7a2a421d73
vf_histogram: avoid floats, unbreak fate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 21:44:50 +02:00
Paul B Mahol
8281791d07
lavfi/histogram: remove pointless store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-15 16:07:51 +00:00
Paul B Mahol
7770975979
lavfi/noise: remove pointless store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-15 15:57:31 +00:00
Clément Bœsch
9ecdd76679
lavfi/curves: fix memleak after master component dition.
2013-04-15 18:04:35 +02:00
Michael Niedermayer
aba678ab9d
deshake: fix off by 2 error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 16:23:28 +02:00
Michael Niedermayer
3d8afb23bc
vf_deshake: Fix crash with r*=64
...
Replace literal numbers by named R_MAX and correct their value
Fixes half of Ticket2443
Based on patch by: João Bernardo <jbvsmo@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 14:28:19 +02:00
Clément Bœsch
1cb02d4fbc
lavfi/curves: add support for Photoshop curves files (.acv).
2013-04-15 11:35:46 +02:00
Clément Bœsch
99dac39339
lavfi/curves: add support for master component.
2013-04-15 11:35:06 +02:00
Clément Bœsch
da1bb21c13
lavfi/aphaser: silence uninitialized variable warnings.
2013-04-15 01:12:26 +02:00
Paul B Mahol
977ee8afd6
lavfi/negate: stop calling lut_init() as that function does nothing now
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-14 22:22:16 +00:00
Paul B Mahol
6ffe911302
lavfi/testsrc: unbreak smptebars only build
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-14 21:13:39 +00:00
Clément Bœsch
dfac37afd2
lavfi: add missing periods in filter descriptions.
2013-04-14 20:58:31 +02:00
Clément Bœsch
1e3104cd3c
Add avpriv_dsputil_init() and use it in lavfi where relevant.
...
dsputil_init() is deprecated and not meant to be exported.
ff_dsputil_init() is internal to libavcodec and thus can not be used.
avpriv_dsputil_init() is the version shared between libraries.
This commit fixes 3 unjustified libavfilter deprecated warnings.
2013-04-14 20:15:54 +02:00
Clément Bœsch
7a92ec93c6
lavfi: port IVTC filters from vapoursynth.
2013-04-14 15:59:37 +02:00
Clément Bœsch
ab0ad6eccf
lavfi: rename decimate to mpdecimate.
...
The next commit will introduce a proper decimation filter to be used
along with the field matching filter. To avoid confusion with this
filter which has currently a very limited usage (and will not work
properly with the fieldmatching filter), the new decimation filter will
take the decimate name, and this filter is renamed to mpdecimate.
2013-04-14 15:59:37 +02:00
Clément Bœsch
f359be96ca
lavfi/smptehdbars: fix priv_class pointer.
...
Fix Ticket2468.
2013-04-14 10:32:35 +02:00
Clément Bœsch
d9be6e69cf
lavfi/testsrc: grammar fix in comment after 03e2ec32
.
2013-04-14 03:27:48 +02:00
Paul B Mahol
03e2ec32b8
lavfi: add smptehdbars source
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-14 00:25:09 +00:00
Nicolas George
6fbb21d685
lavfi/buffersink: factor checks for lists sizes.
2013-04-13 20:19:24 +02:00
Clément Bœsch
73180f5b0e
lavfi: flag more dynamic i/o filters.
2013-04-13 19:43:17 +02:00
Michael Niedermayer
9b672d4017
vf_mp: mp buffers are not compatible with the reference count system
...
We thus must copy each frame on the vf_mp output.
This fixes artifacts with "ffplay -threads 1 dnxhdconv.mov -vf mp=eq2=1:1"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-13 15:02:51 +02:00
Stefano Sabatini
87dd62e141
lavfi/testsrc: make use of AV_OPT_TYPE_DURATION
...
Simplify.
2013-04-13 14:09:16 +02:00
Clément Bœsch
dcea58502c
lavfi: drop now unused shorthand field from AVFilter.
2013-04-13 00:45:30 +02:00
Paul B Mahol
a47288f6dc
lavfi/hue: add support for more alpha formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-12 19:46:19 +00: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
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
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
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
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
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
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
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
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
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
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
9da369604e
lavfi/overlay: improve feedback in case of invalid expression
...
Based on vf_hue.c code.
2013-04-12 00:18:39 +02:00
Stefano Sabatini
aff6cebb41
lavfi/overlay: fix crash in case of invalid expression
2013-04-12 00:09:41 +02:00
Stefano Sabatini
ed2c827575
lavfi/overlay: add repeatlast option
2013-04-12 00:09:19 +02:00
Stefano Sabatini
a77454ec14
lavfi/overlay: reindent constants in option list
...
Wanted-By: ubitux
2013-04-12 00:07:46 +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
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
7bd014eaec
lavfi/aspect: fix d2q convert in init.
...
Regression since git 71ef1ec7b
.
2013-04-11 22:46:47 +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
160ed967f4
lavfi/hue: extend debugging message
...
In particular, show h value in degrees.
2013-04-11 21:37:43 +02:00
Stefano Sabatini
3411aba82c
lavfi/hue: reindent after last commit
2013-04-11 21:37:35 +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
Clément Bœsch
c36ab01cd2
lavfi/ebur128: remove now unused av_opt_free call.
2013-04-11 20:52:41 +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
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
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
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
Anton Khirnov
4a37d4b3f8
lavfi: add const to the pads parameter of avfilter_pad_get_name/type
2013-04-11 20:33:23 +02:00
Anton Khirnov
91d2efa7d6
lavfi: add const to AVFilterContext.filter.
...
lavfi should never modify the filter through that pointer.
2013-04-11 20:32:39 +02:00
Clément Bœsch
c1907bd732
lavfi/removelogo: switch to an AVOptions-based system.
2013-04-11 18:49:46 +02:00
Michael Niedermayer
865e20daf3
avfilter/f_select: use AVFrame metadata accessor function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 18:33:24 +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
Paul B Mahol
567feaafa8
lavfi/bbox: remove unused variables and functions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 14:02:59 +00: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
Paul B Mahol
11f6174a91
lavfi/blend: support more yuv pixel formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 13:10:11 +00: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
2fb8ca7d2c
lavfi/astreamsync: fix eval memleak.
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
Clément Bœsch
389eb0a919
lavfi/testsrc: remove useless args/NULL passing.
2013-04-11 14:36:50 +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
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
32a7b858c9
lavfi: remove telecine libmpcodecs wrapper
...
Native, with more features, filter is available.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:22:11 +00:00
Paul B Mahol
10b1cc63c2
lavfi: remove double .priv_class initializers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:13:42 +00: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
2844ea86c8
lavfi/curves: introduce "all" field in presets and use it.
2013-04-11 13:05:06 +02:00
Clément Bœsch
7e7dc1489f
lavfi/curves: make possible to customize presets.
2013-04-11 13:05:06 +02:00
Clément Bœsch
a1e798ef0a
lavfi/curves: fix a spacing weirdness.
2013-04-11 13:05:06 +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
Clément Bœsch
4c9b031559
lavfi/smartblur: cleanup unused shorthand and doc.
2013-04-11 12:41:13 +02:00
Clément Bœsch
fcaea2170f
lavfi/overlay: cleanup unused shorthand.
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
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
cb20ca14a3
Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
...
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
x86inc: Fix number of operands for cmp* instructions
af_channelmap: fix uninitialized variable use introduced in ba8efac977
lavfi: add a bump and docs entries for the AVOptions switch
Conflicts:
Changelog
doc/APIchanges
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 11:20:55 +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
7c79ec66b6
lavfi/framestep: remove request_frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 00:18:28 +00: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
8695d9de47
lavfi/smarblur: add missing newline at end of verbose message
2013-04-11 00:04:27 +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
Paul B Mahol
16f1e832ba
lavfi/overlay: remove dupe initializer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-10 20:44:11 +00: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
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
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
Stefano Sabatini
e62fca11a8
lavfi/amerge: drop duplicated "Buffer queue overflow" message
...
The same message is shown already by the called function
ff_bufqueue_is_full().
2013-04-10 18:02:00 +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
Michael Niedermayer
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
Michael Niedermayer
a3cb303a4c
avfilter/blackframe: add "thres" back as alternative
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 15:48:41 +02:00
Michael Niedermayer
90efdf98b1
avfilter: support alternative keys in the alternative shorthand system
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 15:47:18 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
828044aca2
Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
...
* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
af_resample: switch to an AVOptions-based system.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 13:30:17 +02:00
Stefano Sabatini
d2752ef061
lavfi/overlay: add process_command callback
2013-04-10 13:11:27 +02:00
Stefano Sabatini
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
Stefano Sabatini
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
Michael Niedermayer
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
Clément Bœsch
d2e051e30c
lavfi/separatefields: adjust tb to avoid rounding errors.
...
Since the PTS need double accuracy, the timebase denominator is doubled
as well, and this new time base is used for the timestamp unit.
2013-04-10 02:38:54 +02:00
Paul B Mahol
d0073c7a0b
separatefields filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-10 00:08:57 +00:00
Anton Khirnov
837112c0c8
af_channelmap: fix uninitialized variable use introduced in ba8efac977
2013-04-09 22:01:34 +02:00
Anton Khirnov
cdac3acb11
lavfi: add a bump and docs entries for the AVOptions switch
2013-04-09 19:13:27 +02:00
Anton Khirnov
8114c10160
lavfi: add avfilter_get_class().
...
Useful for examining options, the same as the corresponding functions
for the other libs.
2013-04-09 19:13:19 +02:00
Anton Khirnov
4d1f31ea44
lavfi: make AVFilterContext export filter options.
2013-04-09 19:13:10 +02:00
Anton Khirnov
62549f9655
lavfi: error out when options are provided to a filter that does not take any
2013-04-09 19:12:59 +02:00
Anton Khirnov
c43a7ecad9
lavfi: remove now unused args parameter from AVFilter.init
2013-04-09 19:12:38 +02:00
Anton Khirnov
7b3eb745b9
vsrc_testsrc: switch to an AVOptions-based system.
2013-04-09 19:12:06 +02:00
Anton Khirnov
a42d6e6c4c
vsrc_movie: switch to an AVOptions-based system.
2013-04-09 19:11:27 +02:00
Anton Khirnov
b7b3302f8f
vsrc_nullsrc: switch to an AVOptions-based system.
2013-04-09 19:11:12 +02:00
Anton Khirnov
7bc1a883c9
vsrc_color: switch to an AVOptions-based system.
2013-04-09 19:11:03 +02:00
Anton Khirnov
73d5d405d4
split: switch to an AVOptions-based system.
2013-04-09 19:10:41 +02:00
Anton Khirnov
b13623e184
af_volume: switch to an AVOptions-based system.
2013-04-09 19:10:27 +02:00
Anton Khirnov
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
Anton Khirnov
3f14febbdf
af_channelsplit: switch to an AVOptions-based system.
2013-04-09 19:10:00 +02:00
Anton Khirnov
ba8efac977
af_channelmap: switch to an AVOptions-based system.
2013-04-09 19:09:40 +02:00
Anton Khirnov
b2b25b0659
af_asyncts: switch to an AVOptions-based system.
2013-04-09 19:09:33 +02:00
Anton Khirnov
ac20e3ab8e
af_amix: switch to an AVOptions-based system.
2013-04-09 19:09:26 +02:00
Anton Khirnov
7536c67104
vf_yadif: switch to an AVOptions-based system.
2013-04-09 19:09:03 +02:00
Anton Khirnov
b83e9efc53
vf_unsharp: switch to an AVOptions-based system.
2013-04-09 19:08:42 +02:00
Anton Khirnov
0c2466dec7
vf_transpose: switch to an AVOptions-based system.
2013-04-09 19:08:04 +02:00
Anton Khirnov
ffea3b00c3
vf_settb: switch to an AVOptions-based system.
2013-04-09 19:07:44 +02:00
Anton Khirnov
33b97faaba
vf_setpts: switch to an AVOptions-based system.
2013-04-09 19:07:28 +02:00
Anton Khirnov
95f1f56a21
vf_select: switch to an AVOptions-based system.
2013-04-09 19:06:51 +02:00
Anton Khirnov
40c885c589
vf_pad: switch to an AVOptions-based system.
2013-04-09 19:06:29 +02:00
Anton Khirnov
9087eaf193
vf_overlay: switch to an AVOptions-based system.
2013-04-09 19:06:13 +02:00
Anton Khirnov
20b46f8f4f
vf_lut: switch to an AVOptions-based system.
2013-04-09 19:05:32 +02:00
Anton Khirnov
ee0e8d4b15
vf_libopencv: switch to an AVOptions-based system.
2013-04-09 19:05:22 +02:00
Anton Khirnov
8c747d46f7
vf_hqdn3d: switch to an AVOptions-based system.
2013-04-09 19:05:12 +02:00
Anton Khirnov
7ed833d78e
vf_gradfun: switch to an AVOptions-based system.
2013-04-09 19:04:57 +02:00
Anton Khirnov
c334c113d4
vf_scale: switch to an AVOptions-based system.
2013-04-09 19:04:45 +02:00
Anton Khirnov
5aa1a668cf
vf_frei0r: switch to an AVOptions-based system.
2013-04-09 19:04:28 +02:00
Anton Khirnov
f13ab29925
vf_fps: switch to an AVOptions-based system.
2013-04-09 19:04:15 +02:00
Anton Khirnov
a39c154049
vf_fieldorder: switch to an AVOptions-based system.
2013-04-09 19:03:56 +02:00
Anton Khirnov
b9dfee9fa2
vf_fade: switch to an AVOptions-based system.
2013-04-09 19:03:43 +02:00
Anton Khirnov
8ec464c61c
vf_drawtext: switch to an AVOptions-based system.
2013-04-09 19:03:23 +02:00
Anton Khirnov
335c31293b
vf_drawbox: switch to an AVOptions-based system.
2013-04-09 19:03:08 +02:00
Anton Khirnov
63e58c55c1
vf_delogo: switch to an AVOptions-based system.
2013-04-09 19:02:43 +02:00
Anton Khirnov
460e7b4f6d
vf_cropdetect: switch to an AVOptions-based system.
2013-04-09 19:02:32 +02:00
Anton Khirnov
fba0156af7
vf_crop: switch to an AVOptions-based system.
2013-04-09 19:00:54 +02:00
Anton Khirnov
51def31dbe
vf_boxblur: switch to an AVOptions-based system.
2013-04-09 19:00:39 +02:00
Anton Khirnov
62dcdb028c
vf_blackframe: switch to an AVOptions-based system.
2013-04-09 19:00:26 +02:00
Anton Khirnov
2831b307e6
vf_aspect: switch to an AVOptions-based system.
2013-04-09 18:58:30 +02:00
Anton Khirnov
e67a87eac8
vf_(no)format: switch to an AVOptions-based system.
2013-04-09 18:56:39 +02:00
Anton Khirnov
0af7fe1f95
af_aformat: switch to an AVOptions-based system.
2013-04-09 18:55:45 +02:00
Anton Khirnov
d28cb84989
buffersrc: switch to an AVOptions-based system.
2013-04-09 18:48:16 +02:00
Anton Khirnov
4fa1f52e33
af_resample: switch to an AVOptions-based system.
2013-04-09 18:45:50 +02:00
Anton Khirnov
b439c992c2
lavfi: switch to an AVOptions-based system.
2013-04-09 18:45:37 +02:00
Michael Niedermayer
5fbf9c12aa
avfilter/vf_noise: fix build without mmx*inline
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09 04:44:32 +02:00
Paul B Mahol
9dc88ac367
lavfi: remove noise libmpcodecs wrapper
...
Native filter have reached similar performance.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-08 20:57:59 +00:00
Paul B Mahol
6934244414
lavfi/noise: copy inline asm from mp=noise
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-08 20:28:57 +00:00
Paul B Mahol
ed8373e7db
lavfi: always check return value of ff_get_{audio,video}_buffer()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-08 19:24:09 +00:00
Clément Bœsch
e82f562fa5
lavfi/mandelbrot: reindent after 51bcd5cd
.
2013-04-08 20:40:54 +02:00
Clément Bœsch
51bcd5cd65
lavfi/mandelbrot: fix speedloss with default config after morphing introduction.
...
Morphing was introduced in 0d6e5a171
and forced cos/sin computations
with some mult all the time. This commit makes sure these are computed
only when morphing is enabled.
2013-04-08 20:35:18 +02:00
Paul B Mahol
9fce2b8854
lavfi/il: use standard option parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-08 12:10:37 +00:00
Paul B Mahol
018cc6f026
lavfi/histogram: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-08 09:04:02 +00:00
Paul B Mahol
1f97dfb77f
lavfi/blend,noise: remove unedeed av_opt_free() call
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-08 09:02:03 +00:00
Michael Niedermayer
28943c4d31
vf_noise: Fix av_lfg_get() maximum value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 19:58:30 +02:00
Michael Niedermayer
62447248f3
vf_noise: remove low quality mode
...
It produces vissible correlation between lines
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 19:54:36 +02:00
Michael Niedermayer
21f4fc2e40
avfilter/vf_mp: fix x86 cpu caps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 18:23:59 +02:00
Paul B Mahol
2b26077c95
lavfi/blend: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 00:14:55 +00:00
Paul B Mahol
a95e683867
lavfi/noise: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 00:14:55 +00:00
Paul B Mahol
659672f3ee
lavfi/afade: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-05 00:14:55 +00:00
Paul B Mahol
bd252ff6fa
lavfi/smptebars: fix invalid writes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 22:10:42 +00:00
Paul B Mahol
b1dea2c0d8
lavfi/blend: add N variable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 15:30:06 +00:00
Paul B Mahol
6a08ccd61d
lavfi/smptebars: fix output for subsampled yuv
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 14:32:49 +00:00
Michael Niedermayer
ab2989378f
Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
...
* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
lavf: make sure stream probe data gets freed.
avfiltergraph: set deprecated filter_count.
Conflicts:
libavformat/utils.c
See: 44a7a6300d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:24:33 +02:00
Anton Khirnov
6d0546bbaf
avfiltergraph: set deprecated filter_count.
2013-04-04 07:52:32 +02:00
Nicolas George
d38c173dfb
lavfi/af_atempo: simplify request_frame loop.
2013-04-03 17:44:10 +02:00
Nicolas George
b570f24d76
lavfi/af_asetnsamples: simplify request_frame loop.
2013-04-03 17:44:10 +02:00
Nicolas George
9566ba91ab
lavfi/f_ebur128: remove request_frame hack.
2013-04-03 17:44:10 +02:00
Nicolas George
77fa554b6e
lavfi/vf_tile: simplify request_frame loop.
2013-04-03 17:44:10 +02:00
Nicolas George
69d67fb622
lavfi: reindent after last commit.
2013-04-03 17:44:10 +02:00
Nicolas George
79d8cfacf0
lavfi: loop on request_frame if necessary.
...
Some filters need several input frames before producing output.
For these filter, it becomes simpler to return 0 in
request_frame() and let the framework call it again until
output has been produced.
2013-04-03 17:33:27 +02:00
Michael Niedermayer
c208576cef
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix make checkheaders without opencl headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-03 15:35:23 +02:00
Carl Eugen Hoyos
c484b3af15
Fix make checkheaders without opencl headers.
2013-04-03 15:28:29 +02:00
Michael Niedermayer
d3fc2db47e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfiltergraph: check for sws opts being non-NULL before using them.
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-03 15:20:05 +02:00
Paul B Mahol
6fcb4ae1d8
lavfi/afade * biquads: call av_frame_copy_props()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 11:10:00 +00:00
Paul B Mahol
0ab10f69ef
lavfi/earwax: clip sample, this is what sox does
...
Fixes #1884 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 10:55:13 +00:00
Carl Eugen Hoyos
6e90d9e206
vf_deshake: Reorder constant arguments in an if() statement.
...
Fixes compilation with clang on netbsd with --disable-optimizations.
Tested-by: Paul B Mahol
2013-04-03 12:52:38 +02:00
Paul B Mahol
bf65752848
aphaser filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 08:33:59 +00:00
Anton Khirnov
6e3c13a559
avfiltergraph: check for sws opts being non-NULL before using them.
...
Avoid snprintfing a NULL pointer.
CC: libav-stable@libav.org
2013-04-03 09:29:55 +02:00
Clément Bœsch
e7692a9bac
lavfi/edgedetect: reindent after previous commit.
2013-04-03 00:31:19 +02:00
Clément Bœsch
e366aec030
lavfi/edgedetect: add direct path.
2013-04-03 00:30:48 +02:00
highgod0401
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
Clément Bœsch
6278bc8a6c
lavfi/curves: make use of options to store the preset names.
2013-04-01 20:37:45 +02:00
Nicolas George
52853077ee
lavfi/af_asetnsamples: fix EOF handling.
...
Only filter one buffered frame.
Correctly return EOF if there is none.
2013-04-01 10:38:52 +02:00
Nicolas George
f810ca63f8
lavfi: detect merge failure for unknown layouts.
...
Detect when filtering known layouts from an explicit list
results in an empty list.
Fix erratic behavior.
2013-04-01 10:37:48 +02:00
Stefano Sabatini
39aad43465
lavfi/overlay: fix debug PTS output in try_filter_frame()
...
The PTS of the input frames must be interpreted according to the input
timebase, which is not the same as the output timebase.
2013-03-31 18:00:44 +02:00
Clément Bœsch
01b2d1288a
lavfi/volume: use designated initializers for the sample_fmts declaration.
2013-03-31 11:58:20 +02:00
Clément Bœsch
4dae804d3c
lavfi/volume: use copy props helper instead of incomplete manual code.
2013-03-31 11:58:20 +02:00
Clément Bœsch
29667a2c20
decimate: check for avctx ptr before closing.
...
Fixes a crash init failed before setting avctx.
2013-03-31 10:00:32 +02:00
Michael Niedermayer
e0dd8cadcc
af_join: fix channel count and format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 15:29:14 +01:00
Michael Niedermayer
acaee26008
af_channelsplit: set output channels, fix assertion failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 14:29:11 +01:00
Paul B Mahol
705b607db8
lavfi/biquads: fix min allowed option value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-28 11:52:11 +00:00
Clément Bœsch
1ae44c87c9
lavfi/gradfun: remove rounding to match C and SSE code.
...
There is no noticable benefit for such precision.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:59:29 +01:00
Clément Bœsch
38a2f88d39
lavfi/gradfun: fix dithering in MMX code.
...
Current dithering only uses the first 4 instead of the whole 8 random values.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:59:18 +01:00
Clément Bœsch
2d66fc543b
lavfi/gradfun: fix rounding in MMX code.
...
Current code divides before increasing precision.
Also reduce upper bound for strength from 255 to 64. This will prevent
an overflow in the SSSE3 and MMX filter_line code: delta is expressed as
an u16 being shifted by 2 to the left. If it overflows, having a
strength not above 64 will make sure that m is set to 0 (making the
m*m*delta >> 14 expression void).
A value above 64 should not make any sense unless gradfun is used as
a blur filter.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:59:04 +01:00
Clément Bœsch
8b9a153ef3
lavfi/gradfun: do not increment DC pointer for odd values.
...
First DC is only used once otherwise. This also makes the code
consistent with ASM versions.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:58:55 +01:00
Michael Niedermayer
0d6e5a1712
vsrc_mandelbrot: Mandel morphing support
...
Example: ffplay -f lavfi "mandelbrot=outer=outz:morphamp=1:end_scale=2:maxiter=100"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27 19:27:37 +01:00
Michael Niedermayer
79938a4e97
mandelbrot: add outer coloring method showing bailouted z
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27 16:21:44 +01:00
Michael Niedermayer
a2b5825649
vsrc_mandelbrot: support coloring the outside white
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27 16:00:18 +01:00
Paul B Mahol
62d36abef4
lavfi/mptestsrc: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:42 +00:00
Paul B Mahol
401f9c95e9
lavfi/cellauto: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:42 +00:00
Paul B Mahol
8c5b37b402
lavfi/life: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:42 +00:00
Paul B Mahol
975efc8864
lavfi/mandelbrot: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:42 +00:00
Paul B Mahol
54056c6655
lavfi/testsrc: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:41 +00:00
Paul B Mahol
7606f4a1af
lavfi/fps: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-26 13:23:41 +00:00
Clément Bœsch
e32cbd0f54
lavfi/perms: add myself to the copyright header.
2013-03-26 02:41:05 +01:00
Clément Bœsch
9371467d9d
lavfi/perms: add seed option.
2013-03-26 02:39:55 +01:00
Clément Bœsch
e600d0628e
lavfi/perms: remove unecessary indirection after f7324c06
.
2013-03-26 02:24:03 +01:00
Clément Bœsch
133035c40d
lavfi/curves: add forgotten strong_contrast preset.
2013-03-26 01:05:26 +01:00
Clément Bœsch
183f3450fd
lavfi/curves: support preset shorthand.
2013-03-26 00:04:06 +01:00
Clément Bœsch
dc65d784df
lavfi/curves: add presets support.
...
Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
2013-03-25 23:48:51 +01:00
Björn S
f248b8a902
blend: Adding yuvj pixelformats to the blend effect
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 13:14:38 +01:00
Michael Niedermayer
ae65327e5e
vsrc_testsrc: avoid floats and non bit exactness
...
The round to zero behavior is maintained, possibly this should
be changed to round to nearest.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 03:11:43 +01:00
Nicolas George
125acd2152
lavfi: support multiple rounds of format negotiation.
...
Remove the temporary hack for amerge and replace it with a
generic solution.
2013-03-24 23:17:47 +01:00
Nicolas George
00da527b44
lavfi/af_amerge: return EAGAIN if the input layouts are not known.
...
Also downgrade the error to a warning.
2013-03-24 23:17:47 +01:00
Clément Bœsch
386dc9a3a8
lavfi/thumbnail: add support for named options.
2013-03-24 20:38:12 +01:00
Stefano Sabatini
3b811bcf67
lavfi/colormatrix: reword error message in init
...
Change:
"source and destination color space are identical"
which is a true fact, but doesn't tell nothing about what's wrong, to:
"Source and destination color space must not be identical"
which tells more explicitly what the problem is.
2013-03-24 20:21:35 +01:00
Stefano Sabatini
1b140835b6
lavfi/colormatrix: add support for named options
2013-03-24 20:21:20 +01:00
Clément Bœsch
cbf224b631
lavfi/tinterlace: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
9e21c89841
lavfi/subtitles: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
06784b737a
lavfi/smartblur: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
15878b2b5b
lavfi/setfield: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
e62587bc5e
lavfi/overlay: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
5dc074d321
lavfi/kerndeint: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
ab228f9163
lavfi/idet: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
552c02f20f
lavfi/histeq: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
b27a8ba13c
lavfi/gradfun: use standard options parsing.
2013-03-24 12:26:25 +01:00
Clément Bœsch
b595819cde
lavfi/geq: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
cb0fb4d04d
lavfi/fieldorder: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
a733481d0a
lavfi/field: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
7edda1a935
lavfi/deshake: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
1341dd2dd0
lavfi/cropdetect: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
a36d903601
lavfi/boxblur: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
3f8072886b
lavfi/blackframe: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
67ad9fd098
lavfi/settb: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
8b994c8c1c
lavfi/select: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
f7324c068f
lavfi/perms: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
07b7c2a217
lavfi/sine: use standard options parsing.
2013-03-24 12:26:24 +01:00
Clément Bœsch
3ac77f67af
lavfi/apad: use standard options parsing.
2013-03-24 12:26:24 +01:00
Michael Niedermayer
62f56fd7ea
buffersink/uninit: use av_frame_free() not unref
...
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 23:49:33 +01:00
Stefano Sabatini
a42d15a3a0
lavfi/anullsrc: add missing checks
2013-03-23 16:53:25 +01:00
Stefano Sabatini
4e8062c2d7
lavfi/anullsrc: remove extra parentheses
2013-03-23 16:53:19 +01:00
Stefano Sabatini
fe2cfd50f0
lavfi/anullsrc: simplify logging code in config_props
2013-03-23 16:53:13 +01:00
Stefano Sabatini
5373a2a221
lavfi/anullsrc: fix format negotiation
...
Samplerate and channel layouts must be set in query_formats.
2013-03-23 16:53:08 +01:00
Michael Niedermayer
9bb6504e3b
Merge commit '20a8ee3061e6d777600c13db731bee3c25878991'
...
* commit '20a8ee3061e6d777600c13db731bee3c25878991':
af_asyncts: fix compensation and PTS monotonicity
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 12:16:32 +01:00
Clément Bœsch
89b4e758d3
lavfi/blend: always peek the first frame of each queue.
...
Before the change, filter_frame() always waited for 2 samples in the
bottom frames queue. This notably fixes commands such as
./ffplay tests/lena.pnm -vf split,blend=c0_mode=addition
2013-03-22 23:09:08 +01:00
Jindřich Makovička
20a8ee3061
af_asyncts: fix compensation and PTS monotonicity
...
This patch improves af_asyncts behavior on streams with bogus PTS, which
are either non-monotonic, or contain PTS jitter, and trigger the
non-monotonicity error. With this patch, af_asyncts is able to correct
these streams and avoid the error.
Firstly, it fixes resample compensation calculation by supplying proper
units to avresample_set_compensation (sample count per second instead
of sample count per some arbitrary frame size). Also, the calculation of
the compensation itself is fixed - delta is proportional to an adjustment
of the compensation, not the compensation itself. Ideally, the compensation
should converge to a value that keeps delta at zero.
To be able to deal with sources with PTS jitter even without resampling,
small PTS errors are adjusted, so the output frames do not overlap.
Finally, one more monotonicity check is added.
The FATE reference changes because now there is 8 less samples of
silence because of the pts jitter.
Signed-off-by: Jindřich Makovička <makovick@gmail.com>
2013-03-22 20:09:34 +01:00
Paul B Mahol
c5b484e616
lavfi/vf_stereo3d: use standard options parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-21 09:17:32 +00:00
Michael Niedermayer
76fdced109
asrc_sine: avoid use of INFINITY as it might be a non constant
...
This should fix compilation on openbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21 00:53:57 +01:00
Nicolas George
2753d4ebf0
lavfi/vf_yadif: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
8d4d11cd89
lavfi/vf_unsharp: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
769cc30072
lavfi/vf_transpose: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
392ec7ec1c
lavfi/vf_pad: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
b201c167d0
lavfi/vf_fps: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
4e2bcec95f
lavfi/vf_fade: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
80580b405a
lavi/vf_drawbox: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
37438d0a72
lavfi/vf_delogo: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
40ecd44f00
lavfi/vf_decimate: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
6202cf5dd8
lavfi/vf_crop: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
e9ca55aedd
lavfi/af_volume: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
e9f45a833d
lavfi/vf_tile: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
8c6c811b21
lavfi/avf_concat: use standard options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
befbcc374d
lavfi: add common code to handle options parsing.
2013-03-20 21:13:56 +01:00
Nicolas George
21b092de7c
lavfi: add sine audio source.
2013-03-20 21:04:28 +01:00
Nicolas George
68fb7e260b
lavfi/concat: fix silence duration computation.
...
Inside send_silence(), delta_ts was used inconsistently:
sometimes as the new value, sometimes as the old value.
Consistently use it as the new value, and add an argument
to know the last segment duration.
2013-03-20 20:59:45 +01:00
Nicolas George
5eb273b2e7
lavfi/buffersink: check av_frame_ref() failure.
2013-03-20 13:35:24 +01:00
Paul B Mahol
ac44e52f50
lavfi/showwaves: make use of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-20 12:29:54 +00:00
Michael Niedermayer
df804041bd
Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804'
...
* commit '6599b087de62a5f9f2a8d61a1952d777d1bff804':
buffersrc: fix a typo.
lavc, lavfi: fix counting number of planes in AVBufferRef wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 11:30:56 +01:00
Paul B Mahol
17c1881d58
lavfi: remove harddup libmpcodecs wrapper
...
It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-19 17:15:53 +00:00
Anton Khirnov
6599b087de
buffersrc: fix a typo.
...
Vertical shift is log2_chroma_h, not log2_chroma_w.
2013-03-19 11:12:17 +01:00
Anton Khirnov
c977039e58
lavc, lavfi: fix counting number of planes in AVBufferRef wrappers
...
Number of planes is not always equal to the number of components even
for formats marked with PIX_FMT_PLANAR -- e.g. NV12 has three components
in two planes.
2013-03-19 11:12:17 +01:00
Clément Bœsch
c10b57973d
lavfi/pad: fix horizontal/vertical shift confusion.
2013-03-18 08:51:55 +01:00
Clément Bœsch
76d1c07c89
lavfi/ebur128: add metadata injection.
2013-03-18 03:21:08 +01:00
Michael Niedermayer
8152451b56
buffersrc: fix w/h error
...
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 02:00:57 +01:00
Michael Niedermayer
975fbd43ad
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/buffersink: fix header.
lavfi/buffersrc: disable deprecated warnings.
lavfi/buffersrc: check channel count changes.
lavfi/buffersrc: set channel layout if it is known.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 14:30:33 +01:00
Stefano Sabatini
5787a71637
lavfi/swapuv: remove deprecated base field use
2013-03-17 13:06:01 +01:00
Michael Niedermayer
171bd38eda
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 12:59:04 +01:00
Nicolas George
7e6c67dd24
lavfi/buffersink: fix header.
...
Move non-obsolete functions, structures and constants outside
the scope of "#if FF_API_AVFILTERBUFFER".
Add attribute_deprecated to av_buffersink_get_buffer_ref()
and av_buffersink_poll_frame().
Add doxygen for av_buffersink_get_frame_flags().
2013-03-17 12:31:25 +01:00
Nicolas George
a5149607df
lavfi/buffersrc: disable deprecated warnings.
2013-03-17 12:31:24 +01:00
Nicolas George
f29c28a884
lavfi/buffersrc: check channel count changes.
2013-03-17 12:31:24 +01:00
Nicolas George
3cd342636f
lavfi/buffersrc: set channel layout if it is known.
...
Introduced in 01649c7
, lost in the API change.
2013-03-17 11:59:51 +01:00
Anton Khirnov
6552808014
lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers
...
It is supposed to be height * linesize, not width * linesize.
Thanks to Hendrik Leppkes for pointing out the bug.
2013-03-17 09:10:04 +01:00
Clément Bœsch
286153ea48
lavfi/alphaextract: fix frame memleak.
2013-03-17 03:12:44 +01:00
Clément Bœsch
2b27f7fb04
lavfi/thumbnail: replace frame unref with free.
...
Fixes memleak spotted by FATE.
2013-03-17 01:46:22 +01:00
Stefano Sabatini
db36ea5b5e
lavfi/settb: add support for named options
2013-03-17 00:27:33 +01:00
Stefano Sabatini
0407a79e41
lavfi/blackframe: add support for named options
2013-03-17 00:27:08 +01:00
Hendrik Leppkes
d8dccf69ff
lavfi: let gcc realign the stack on public graph driving functions
...
The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.
This fixes a crash in YADIF filter when using a mingw build in a MSVC application.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 23:52:35 +01:00
Clément Bœsch
8d84e90c9b
lavfi/delogo: 10l forgotten trailing NULL in shorthand.
...
Regression since de3e0ab3
.
2013-03-16 23:37:58 +01:00
James Darnley
c9a51c29fc
yadif: remove an 'm' from the LOAD macro definition
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:33:49 +01:00
James Darnley
1d3b14cac2
yadif: remove repeated check on width
...
The filter already checks that width (and height) are greater than 3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:33:30 +01:00
James Darnley
7976d92dac
yadif: cosmetic indentation from previous commits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:33:06 +01:00
James Darnley
0a5814c9ba
yadif: x86 assembly for 9 to 14-bit samples
...
These smaller samples do not need to be unpacked to double words
allowing the code to process more pixels every iteration (still 2 in MMX
but 6 in SSE2). It also avoids emulating the missing double word
instructions on older instruction sets.
Like with the previous code for 16-bit samples this has been tested on
an Athlon64 and a Core2Quad.
Athlon64:
1809275 decicycles in C, 32718 runs, 50 skips
911675 decicycles in mmx, 32727 runs, 41 skips, 2.0x faster
495284 decicycles in sse2, 32747 runs, 21 skips, 3.7x faster
Core2Quad:
921363 decicycles in C, 32756 runs, 12 skips
486537 decicycles in mmx, 32764 runs, 4 skips, 1.9x faster
293296 decicycles in sse2, 32759 runs, 9 skips, 3.1x faster
284910 decicycles in ssse3, 32759 runs, 9 skips, 3.2x faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:32:54 +01:00
James Darnley
17e7b49501
yadif: x86 assembly for 16-bit samples
...
This is a fairly dumb copy of the assembly for 8-bit samples but it
works and produces identical output to the C version. The options have
been tested on an Athlon64 and a Core2Quad.
Athlon64:
1810385 decicycles in C, 32726 runs, 42 skips
1080744 decicycles in mmx, 32744 runs, 24 skips, 1.7x faster
818315 decicycles in sse2, 32735 runs, 33 skips, 2.2x faster
Core2Quad:
924025 decicycles in C, 32750 runs, 18 skips
623995 decicycles in mmx, 32767 runs, 1 skips, 1.5x faster
406223 decicycles in sse2, 32764 runs, 4 skips, 2.3x faster
387842 decicycles in ssse3, 32767 runs, 1 skips, 2.4x faster
307726 decicycles in sse4, 32763 runs, 5 skips, 3.0x faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 22:32:34 +01:00
Hendrik Leppkes
a77f453703
lavfi/avcodec: deprecate remainders of the avcodec glue code
...
Since lavfi works natively with AVFrame now, these functions are no longer
necessary and can be removed in a future bump.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 17:04:36 +01:00
Michael Niedermayer
946cbf04ee
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
af_join: do not leak input frames.
asrc_anullsrc: return EOF, not -1
Conflicts:
libavfilter/asrc_anullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:58:41 +01:00
Michael Niedermayer
7fff5781b6
Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
...
* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
vf_showinfo: remove its useless init function
AVOptions: fix using named constants with child contexts.
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:38:11 +01:00
Michael Niedermayer
b64077bebe
Merge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'
...
* commit '9676b9a2cdc4a90611188fc48d8d388e427997c5':
AVOption: remove an unused function parameter.
filters.texi: restore mistakenly removed section name for noformat
avfiltergraph: use sizeof(var) instead of sizeof(type)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:28:27 +01:00
Michael Niedermayer
ecade984ac
Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
...
* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:09:37 +01:00
Clément Bœsch
3b2b636a2a
lavfi: add perms and aperms filters.
2013-03-16 16:04:59 +01:00
Anton Khirnov
4750b05d67
af_join: do not leak input frames.
2013-03-16 05:37:01 +01:00
Anton Khirnov
c2b9bd97f5
asrc_anullsrc: return EOF, not -1
2013-03-16 05:36:46 +01:00
Anton Khirnov
f4281f4571
asrc_anullsrc: do not set samplerate and channel layout explicitly
...
They are auto-negotiated.
2013-03-16 05:36:35 +01:00
Anton Khirnov
e4a7b2177d
vf_showinfo: remove its useless init function
...
Filter private data is memset to 0 so there is no point in explicitly
initing anything to 0.
2013-03-16 05:36:14 +01:00
Anton Khirnov
dd74e3ef33
avfiltergraph: use sizeof(var) instead of sizeof(type)
2013-03-16 05:34:20 +01:00
Anton Khirnov
42c7c61ab2
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
...
This is more consistent with the naming in the rest of Libav.
2013-03-16 05:33:23 +01:00
Anton Khirnov
556aab8f11
lavfi: use designated initializers in avfilter_class
2013-03-16 05:33:06 +01:00
James Darnley
3d751b1ef6
yadif: correct strides in filter_edges_16bit
...
The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 19:10:55 +01:00
Michael Niedermayer
cd5f50a255
avfilter: avoid direct access to AVFrame.channels
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 16:13:53 +01:00
Michael Niedermayer
0bcea7b575
vf_pp: use new API to access qp table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15 03:02:27 +01:00
Clément Bœsch
1edbeb3532
lavfi/ebur128: check histogram allocations.
2013-03-15 02:58:29 +01:00
Clément Bœsch
db670e5366
lavfi/ebur128: add framelog option.
2013-03-15 02:35:26 +01:00
Nicolas George
7a71544f9d
lavfi/graphdump: fix output for unknown layouts.
2013-03-14 20:52:50 +01:00
Clément Bœsch
9ace0dbe41
lavfi/ebur128: use same ref for inputs and outputs.
...
Fixes Ticket2342.
2013-03-14 18:43:53 +01:00
Clément Bœsch
fe898a037d
Revert "lavfi/ebur128: fix format negociation for output."
...
This reverts commit 9efcfbed9d
.
All the shame on me; this commit is actually causing more problems
(broken outputs but also crashes) than it was solving.
2013-03-14 06:25:20 +01:00
Clément Bœsch
9efcfbed9d
lavfi/ebur128: fix format negociation for output.
...
Before this change, the audio input and output formats are set
independently, so the lavfi negociation could pick different settings
for the input and output. This is particularly true for the channel
layout settings, where multiple choices were available.
Fixes Ticket2342.
2013-03-14 01:24:42 +01:00
Clément Bœsch
a95a38793c
lavfi/thumbnail: support flushing.
...
This makes possible the raise of one picture if the input has less than
the number of frames to analyze.
Fixes Ticket1992.
2013-03-14 00:14:19 +01:00
Hendrik Leppkes
ed69c69a01
lavfi/avcodec: fix API version checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 22:18:02 +01:00
Hendrik Leppkes
3c7f669972
lavfi/avcodec: cleanup includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 22:14:58 +01:00
James Darnley
0735b50880
yadif: restore speed of the C filtering code
...
Always use the special filter for the first and last 3 columns (only).
Changes made in 64ed397
slowed the filter to just under 3/4 of what it
was. This commit restores the speed while maintaining identical output.
For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 22:07:25 +01:00
Stefano Sabatini
ae732640ab
lavfi/cropdetect: add support for named options
2013-03-13 20:38:54 +01:00
Clément Bœsch
de3e0ab35f
lavfi/delogo: remove sscanf and rely on av_opt_set_from_string() only.
2013-03-13 19:00:10 +01:00
Clément Bœsch
e7279638e8
lavfi/thumbnail: remove unecessary poll_frame() callback.
2013-03-13 19:00:10 +01:00
Clément Bœsch
bce2e97a16
lavfi/mptestsrc: raise filter_frame() error.
2013-03-13 19:00:10 +01:00
Clément Bœsch
afa0b90803
lavfi/mandelbrot: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
227a4b63f5
lavfi/life: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
fe6077d902
lavfi/cellauto: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
f32fee570a
lavfi/alphamerge: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
05854f5505
lavfi/movie: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
bdbdadbaff
lavfi/buffersrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
27ce858c98
lavfi/showspectrum: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
df5be5e275
lavfi/avfilter: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
60bd8c11b6
lavfi/concat: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
00a13a9cdb
lavfi/anullsrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
44f3d21799
lavfi/aevalsrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
1b0d0e6b72
lavfi/atempo: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
dda59d9adc
lavfi/asetnsamples: raise filter_frame() error.
2013-03-13 19:00:08 +01:00
Clément Bœsch
c82bb2815b
lavfi/aresample: raise filter_frame() error.
2013-03-13 19:00:08 +01:00
Michael Niedermayer
c31f07574d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
hqdn3d: Fix out of array read in LOWPASS
cabac: remove unused argument of ff_init_cabac_states()
rawdec: fix a typo -- || instead of |
Conflicts:
libavcodec/cabac.c
libavcodec/h264.c
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 14:49:00 +01:00
Michael Niedermayer
8bcebf9e4a
Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'
...
* commit '555000c7d5c1e13043a948ebc48d2939b0ba6536':
h264: check that DPB is allocated before accessing it in flush_dpb()
vf_hqdn3d: fix uninitialized variable use
vf_gradfun: fix uninitialized variable use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:34:06 +01:00
Loren Merritt
5b3c1aecb2
hqdn3d: Fix out of array read in LOWPASS
...
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-13 09:14:59 +01:00
Stefano Sabatini
aeac1dae29
lavfi/fieldorder: add support to named options
2013-03-13 00:37:13 +01:00
Stefano Sabatini
a3233e9d7a
lavfi/fieldorder: remove unused headers and commented define
2013-03-13 00:34:51 +01:00
Nicolas George
c14a8c834c
lavfi/buffersink: schedule removing the "ff" variants.
...
They are no longer needed since there is no incompatible
ABI version.
2013-03-12 23:31:07 +01:00
Nicolas George
9a2688826d
lavfi/buffersink: rename filter structures.
...
Reduce the diff with the fork.
2013-03-12 23:31:07 +01:00
Michael Niedermayer
212b89f8b4
avfilter: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:23:54 +01:00
Michael Niedermayer
0cfbfaaa12
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
...
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:44:15 +01:00
Michael Niedermayer
a75f01d7e0
Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'
...
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
Add the bumps and APIchanges entries for reference counted buffers changes.
Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:35:39 +01:00
Hendrik Leppkes
c69acbf881
lavfi/moviesrc: use refcounted frames
2013-03-12 03:23:57 +01:00
Nicolas George
73b40e2eb6
lavfi/buffersink: move the filter structures at the end.
...
Also apply a few cosmetic fixes (spaces, trailing comma) to
help match them with the fork's implementation.
2013-03-11 19:00:49 +01:00
Anton Khirnov
d0a863ac89
vf_hqdn3d: fix uninitialized variable use
...
CC:libav-stable@libav.org
2013-03-11 18:28:35 +01:00
Anton Khirnov
887d31d455
vf_gradfun: fix uninitialized variable use
...
CC:libav-stable@libav.org
2013-03-11 18:28:34 +01:00
Nicolas George
de54a96aa8
lavfi/buffersink: implement av_buffersink_get_samples().
...
Note: the implementation could be more efficient, but at
the cost of more diff.
Most of the code from the following commit:
commit a2cd9be212
Author: Anton Khirnov <anton@khirnov.net>
Date: Fri May 4 19:22:38 2012 +0200
lavfi: add an audio buffer sink.
Adapted to call av_buffersink_get_frame_flags() instead of
accessing the frame directly.
2013-03-10 19:39:25 +01:00
Nicolas George
b71db3f38e
lavfi/buffersrc: do not dereference NULL frame.
...
frame = NULL is used to indicate EOF.
2013-03-10 17:05:55 +01:00
Nicolas George
03b87fe5e3
lavfi: rename sink_buffer.c into buffersink.c.
2013-03-10 17:05:55 +01:00
Nicolas George
3add5dc88e
lavfi: remove buffersink.c.
...
It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.
2013-03-10 17:05:55 +01:00
Nicolas George
fa41f7ecd6
lavfi/sink_buffer: move stuff to reduce the diff.
...
Note: av_buffersink_get_samples() is not yet implemented,
abuffersink is not yet a drop-in replacement of the fork's
abuffersink.
2013-03-10 17:05:46 +01:00
Stefano Sabatini
35135a3989
lavfi/smartblur: add support to named options
2013-03-10 16:38:45 +01:00
Nicolas George
b0012de420
lavfi/buffersrc: implement flags.
...
The PUSH flags is necessary for efficient scheduling;
otherwise there is no feedback when adding frames to
closed paths.
The NO_CHECK_FORMAT is a small optimization that does
not cost much to implement.
The KEEP_REF flag maps to the add/write distinction in
the fork's API.
2013-03-10 13:56:17 +01:00
Stefano Sabatini
606efe18be
lavfi/unsharp: add missing option flags
2013-03-10 13:22:58 +01:00
Michael Niedermayer
f963c77856
avfilter: avoid direct access to "frame"->channels
...
This avoids ABI issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 11:25:54 +01:00
Xi Wang
5d639b2b4a
vf_pad: fix a & instead of && typo
...
Avoid buffer overflow in buffer_needs_copy()
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-03-10 11:16:10 +01:00
Xi Wang
969e8d35b5
lavfi/pad: avoid buffer overflow in buffer_needs_copy()
...
Replace & with short-circuit &&.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-03-10 10:38:42 +01:00
Clément Bœsch
65fc80f012
lavfi: add curves filter.
2013-03-10 03:00:10 +01:00
Clément Bœsch
3d813e7ec3
lavfi: bump minor version after the first round of evil changes.
2013-03-10 02:59:43 +01:00
Michael Niedermayer
108434a30c
sink_buffer: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 02:52:15 +01:00
Clément Bœsch
96e4b00d62
lavfi: remove remaining forgotten min/rej perms.
2013-03-10 02:38:21 +01:00