661e284b4a
telecine filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:12:39 +00:00
0d58bbb28d
lavfi/buffersrc: update for compatibility with the fork.
...
Merge and adapt commit d28cb84
2013-04-11 13:09:10 +02:00
7e7dc1489f
lavfi/curves: make possible to customize presets.
2013-04-11 13:05:06 +02:00
c66c92add6
doc/opencl: speling and gramer fixes
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:00:04 +02:00
9d442b9cc0
opencl: add spec opencl device APIs 20130411
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 12:46:34 +02:00
f223ad1e00
doc: document the prores encoder options
...
Adapted from the author's blag.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-11 12:42:09 +02:00
4c9b031559
lavfi/smartblur: cleanup unused shorthand and doc.
2013-04-11 12:41:13 +02:00
3417280b57
lavfi/field: cleanup unused shorthand and doc.
2013-04-11 12:41:13 +02:00
9e6b5e61a0
img2enc: add an option for overwriting one file with subsequent images
...
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
2013-04-11 12:30:44 +02:00
77add967a5
lavfi/setfield: switch to an AVOptions-based system.
2013-04-11 11:53:53 +02:00
73c1a00e73
lavfi/asettb: switch to an AVOptions-based system.
2013-04-11 11:53:53 +02:00
cb2327e88d
lavfi/aselect: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
bca4cafaf2
lavfi/sine: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
9ceb7bdf6f
lavfi/deshake: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
c85f56bb4f
lavfi/tinterlace: switch to an AVOptions-based system.
2013-04-11 11:51:48 +02:00
64a103138c
lavfi/tile: switch to an AVOptions-based system.
2013-04-11 11:51:47 +02:00
35a27402ad
lavfi/concat: switch to an AVOptions-based system.
2013-04-11 11:51:47 +02:00
cb20ca14a3
Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
...
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
x86inc: Fix number of operands for cmp* instructions
af_channelmap: fix uninitialized variable use introduced in ba8efac977
2013-04-11 11:20:55 +02:00
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
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
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
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
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
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
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
f43da3def7
lavfi/aphaser: switch to AVOption-based system
2013-04-11 01:37:57 +02:00
2b17e58163
lavfi/afade: switch to AVOption-base system
2013-04-11 01:25:02 +02:00
6afed2aec1
lavfi/blend: switch to AVOption-based system
2013-04-11 01:25:02 +02:00
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
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
7668b6832d
lavfi/idet: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
b2d589188f
lavfi/histogram: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
d5226fc575
lavfi/stereo3d: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
a689a6b698
lavfi/noise: switch to an AVOptions-based system.
2013-04-11 01:04:45 +02:00
e4bd1db88e
lavfi/histeq: switch to an AVOptions-based system.
2013-04-11 01:04:44 +02:00
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
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
531158e6be
lavfi/kerndeint: switch to AVOption-based system
2013-04-11 00:55:45 +02:00
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
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
6f46403cb0
lavfi/il: switch to AVOption-based system
2013-04-11 00:31:25 +02:00
4ecee69b20
lavfi/mptestsrc: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
791da4706c
lavfi/mandelbrot: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
bd85fee914
lavfi/life: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
169880e31d
lavfi/cellauto: switch to an AVOptions-based system.
2013-04-11 00:21:47 +02:00
cff8f91ddf
lavfi/decimate: switch to an AVOption-based system
2013-04-11 00:20:01 +02:00
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
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
2ffee3ec14
lavfi/smartblur: switch to AVOption-based system
2013-04-11 00:04:27 +02:00
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
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
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
e2b0edb6ac
lavfi/subtitles: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
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
f8eabab04d
lavfi/geq: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
1cdb9f48db
lavfi/edgedetect: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
34610e11e7
lavfi/curves: switch to an AVOptions-based system.
2013-04-10 23:16:03 +02:00
8da1f1f208
lavfi/colormatrix: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
8388e1e2b3
lavfi/perms: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
5afd58fbb4
lavfi/ebur128: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
4964ec2cd4
lavfi/showspectrum: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
1b1688bfc6
lavfi/silencedetect: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
7c11c21669
lavfi/thumbnail: switch to an AVOptions-based system.
2013-04-10 23:16:02 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
215ca86475
doc/filters: review introductory example and explanation
...
In particular, fix wrong vertical mirroring command, and clarify
and extend explanation.
Based on a patch by littlebat <dashing.meng@gmail.com>.
Should fix trac ticket #2413 .
2013-04-10 18:02:00 +02:00
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
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
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
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
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
d2752ef061
lavfi/overlay: add process_command callback
2013-04-10 13:11:27 +02:00
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
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
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
2a7f885fe1
lavf: add libquvi demuxer.
2013-04-10 12:09:20 +02:00
d0073c7a0b
separatefields filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-10 00:08:57 +00:00
cdac3acb11
lavfi: add a bump and docs entries for the AVOptions switch
2013-04-09 19:13:27 +02:00
7b3eb745b9
vsrc_testsrc: switch to an AVOptions-based system.
2013-04-09 19:12:06 +02:00
a42d6e6c4c
vsrc_movie: switch to an AVOptions-based system.
2013-04-09 19:11:27 +02:00
7bc1a883c9
vsrc_color: switch to an AVOptions-based system.
2013-04-09 19:11:03 +02:00
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
ba8efac977
af_channelmap: switch to an AVOptions-based system.
2013-04-09 19:09:40 +02:00
7536c67104
vf_yadif: switch to an AVOptions-based system.
2013-04-09 19:09:03 +02:00
b83e9efc53
vf_unsharp: switch to an AVOptions-based system.
2013-04-09 19:08:42 +02:00
0c2466dec7
vf_transpose: switch to an AVOptions-based system.
2013-04-09 19:08:04 +02:00
ffea3b00c3
vf_settb: switch to an AVOptions-based system.
2013-04-09 19:07:44 +02:00
33b97faaba
vf_setpts: switch to an AVOptions-based system.
2013-04-09 19:07:28 +02:00
95f1f56a21
vf_select: switch to an AVOptions-based system.
2013-04-09 19:06:51 +02:00
40c885c589
vf_pad: switch to an AVOptions-based system.
2013-04-09 19:06:29 +02:00
9087eaf193
vf_overlay: switch to an AVOptions-based system.
2013-04-09 19:06:13 +02:00
20b46f8f4f
vf_lut: switch to an AVOptions-based system.
2013-04-09 19:05:32 +02:00
ee0e8d4b15
vf_libopencv: switch to an AVOptions-based system.
2013-04-09 19:05:22 +02:00
8c747d46f7
vf_hqdn3d: switch to an AVOptions-based system.
2013-04-09 19:05:12 +02:00
7ed833d78e
vf_gradfun: switch to an AVOptions-based system.
2013-04-09 19:04:57 +02:00
c334c113d4
vf_scale: switch to an AVOptions-based system.
2013-04-09 19:04:45 +02:00
5aa1a668cf
vf_frei0r: switch to an AVOptions-based system.
2013-04-09 19:04:28 +02:00
a39c154049
vf_fieldorder: switch to an AVOptions-based system.
2013-04-09 19:03:56 +02:00
b9dfee9fa2
vf_fade: switch to an AVOptions-based system.
2013-04-09 19:03:43 +02:00
8ec464c61c
vf_drawtext: switch to an AVOptions-based system.
2013-04-09 19:03:23 +02:00
335c31293b
vf_drawbox: switch to an AVOptions-based system.
2013-04-09 19:03:08 +02:00
63e58c55c1
vf_delogo: switch to an AVOptions-based system.
2013-04-09 19:02:43 +02:00
460e7b4f6d
vf_cropdetect: switch to an AVOptions-based system.
2013-04-09 19:02:32 +02:00
fba0156af7
vf_crop: switch to an AVOptions-based system.
2013-04-09 19:00:54 +02:00
51def31dbe
vf_boxblur: switch to an AVOptions-based system.
2013-04-09 19:00:39 +02:00
62dcdb028c
vf_blackframe: switch to an AVOptions-based system.
2013-04-09 19:00:26 +02:00
2831b307e6
vf_aspect: switch to an AVOptions-based system.
2013-04-09 18:58:30 +02:00
e67a87eac8
vf_(no)format: switch to an AVOptions-based system.
2013-04-09 18:56:39 +02:00
0af7fe1f95
af_aformat: switch to an AVOptions-based system.
2013-04-09 18:55:45 +02:00
d28cb84989
buffersrc: switch to an AVOptions-based system.
2013-04-09 18:48:16 +02:00
b439c992c2
lavfi: switch to an AVOptions-based system.
2013-04-09 18:45:37 +02:00
0678c388ba
rtsp: add option to set the socket timeout of the lower protocol.
...
Fixes Ticket2294
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-08 17:45:13 +02:00
84bfa8beb7
Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'
...
* commit 'a862c7d3368241e72a465ab944afa38ea62a6640':
Integrate lcov/gcov into Libav
Conflicts:
Makefile
common.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 13:23:38 +02:00
7775992c65
doc/filters: fix main/over mismatch in movie examples
...
Found-By: littlebat <dashing.meng@gmail.com>
2013-04-06 00:54:46 +02:00
a862c7d336
Integrate lcov/gcov into Libav
...
The gcov/lcov are a common toolchain for visualizing code coverage with
the GNU/Toolchain. The documentation and implementation of this
integration was heavily inspired from the blog entry by Mike Melanson:
http://multimedia.cx/eggs/using-lcov-with-ffmpeg/
2013-04-05 18:55:11 +02:00
029cca6fb3
doc/filters: clarify example explanation
2013-04-05 12:47:10 +02:00
89d581f15e
doc/filters: fix old broken syntax of color source in overlay example
...
Found-By: littlebat <dashing.meng@gmail.com>
2013-04-05 12:47:10 +02:00
9b4d9d8795
doc: enable compilation of -all tool pages
...
In particular, add documentation configuration system, through the
doc/config.texi file.
Fix trac issue #2374 .
2013-04-05 10:11:57 +02:00
702e743827
doc: move ffmpeg-scaler.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
a6cd26fc93
doc: move ffmpeg-resampler.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
a7990287aa
doc: move ffmpeg-devices.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
2086c7e173
doc: move ffmpeg-formats.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
d5f3a0c221
doc: move ffmpeg-codecs.texi content to separated file
...
This should simplify inclusion in monolithic tool manuals.
2013-04-05 10:11:57 +02:00
c430eb2d58
doc/filters: fix erroneously truncated comment on a scale example
2013-04-05 01:18:06 +02:00
e80bc76e9e
doc/filters: put separated geq variables in separate lines
...
Make clear that they are not aliases for the same variable.
2013-04-05 01:18:06 +02:00
0f8435c089
doc: document -v repeat
...
Thanks-to: Derek Buitenhuis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 23:36:57 +02:00
b1dea2c0d8
lavfi/blend: add N variable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 15:30:06 +00:00
e7389ed5d0
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
...
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:00:59 +02:00
d344b99954
doc/ffprobe: fix references in See Also section
2013-04-04 10:13:30 +02:00
36babfdc39
doc/fate.texi: fix typo
2013-04-03 21:07:15 +02:00
9cb25440b3
doc/filters: fix error in blend description
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 17:06:25 +00:00
bf65752848
aphaser filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 08:33:59 +00:00
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
7d05751581
doc: Grammar fixes for strem specifiers section
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
0cb2d32453
doc: Fix broken English in the common options description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
a034cdf49d
doc: Grammar fixes for stream selection
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
9db706206d
doc: Consistently use 'filtergraph'
...
We used to use 'filtergraph' or 'filter graph' randomly.
'filtergraph' was chosen due to having 57 occurrences in
the documentation, whereas 'filter graph' had only 19.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
9249b28e79
doc: Grammar fixes for FFmpeg's detailed description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
fe64b88950
doc: Consistently use 'frame rate' everywhere
...
We used to use 'framerate' or 'frame rate' randomly.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
91b5ee6699
doc: Grammar fixes for FFmpeg description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
9f597052d4
doc: Fix grammar in -n description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
876fe11e32
doc: Small grammar fix in -f description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
e54a15b681
doc: Document which cpuflags exist
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
4c79367e9b
doc: Explain the various logevel settings
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:02 -04:00
1fb8ecb498
doc: Remove list of format fields
...
These are available in the output of -formats.
Similarily, we do not list the fields for e.g. -codecs.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:02:18 -04:00
a9f8182a9d
doxygen: dont strip code comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-31 22:34:13 +02:00
66c92a1575
examples/resampling_audio: make use of av_samples_alloc_array_and_samples()
...
Simplify.
2013-03-31 18:00:45 +02:00
5c73645d91
lavu/samplefmt: add av_samples_alloc_array_and_pointers()
2013-03-31 18:00:44 +02:00
874173002e
doc/filters: fix width/height typo in crop filter.
...
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
2013-03-31 12:20:17 +02:00
f8201cc18b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc/platform: Remove part about dllimport
vp8: Fix pthread_cond and pthread_mutex leaks
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-31 11:31:19 +02:00
f2f57d1679
doc/platform: Remove part about dllimport
...
Only deprecated things need this at all anymore, as we have functions
to access them or they are no longer needed.
The document should not encourage use of deprecated APIs.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-30 13:52:02 -04:00
c838701ce4
doc/texi2pod.pl: skip printing chapter names if they are disabled
2013-03-30 16:58:45 +01:00
6c8aa2035d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add an option to generate the references
Conflicts:
doc/fate.texi
tests/fate-run.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-30 11:21:15 +01:00
ef7b6b489a
ffmpeg/avformat: factor av_guess_frame_rate() out
...
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-29 17:40:28 +01:00
b01b60a29d
fate: add an option to generate the references
...
Useful to add or update fate tests.
2013-03-29 15:41:26 +01:00
ac1a1fd708
Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
...
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
lavfi/gradfun: remove rounding to match C and SSE code.
lavfi/gradfun: fix dithering in MMX code.
lavfi/gradfun: fix rounding in MMX code.
lavfi/gradfun: do not increment DC pointer for odd values.
fate: filter: Add dependencies
avconv: add options for reading filtergraphs from a file.
Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 13:00:39 +01:00
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
a4208b9b7d
avconv: add options for reading filtergraphs from a file.
2013-03-28 07:55:48 +01:00
1a3f7ded14
doc: "av* tools" -> "ff* tools".
...
Spotted-by: Timothy Gu <timothygu99@gmail.com>
2013-03-27 01:44:20 +01:00
9371467d9d
lavfi/perms: add seed option.
2013-03-26 02:39:55 +01:00
133035c40d
lavfi/curves: add forgotten strong_contrast preset.
2013-03-26 01:05:26 +01:00
183f3450fd
lavfi/curves: support preset shorthand.
2013-03-26 00:04:06 +01:00
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
4f112a8e34
lavf/mux: add the flush_packets option.
...
Note: a lot of muxers already do the flushing explicitly.
2013-03-24 23:19:07 +01:00
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
386dc9a3a8
lavfi/thumbnail: add support for named options.
2013-03-24 20:38:12 +01:00
1b140835b6
lavfi/colormatrix: add support for named options
2013-03-24 20:21:20 +01:00
e54eb8db9c
mips: Optimization of AAC psychoacoustic model functions
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 16:19:38 +01:00
785b849f1c
lavd/v4l2: honor previously selected input channel
...
An input channel could have been previously set with another application, like
v4l2-ctl, so if no input channel is specified use the previosly selected one.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 13:43:56 +01:00
abbc34c372
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Enable hwaccels without external dependencies by default.
doc/developer: Clarify symbol naming prefixes section.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-22 12:58:22 +01:00
77f60f0011
lavu/eval: add between() function.
2013-03-22 09:20:45 +01:00
72ad96c854
doc/developer: Clarify symbol naming prefixes section.
2013-03-21 14:17:37 +01:00
21b092de7c
lavfi: add sine audio source.
2013-03-20 21:04:28 +01:00
8d928a9d99
lavu/opt: add AV_OPT_TYPE_DURATION.
2013-03-20 21:04:28 +01:00
de1a71595d
lavf/concatdec: support seeking.
2013-03-20 20:59:24 +01:00
7aa9af51db
lavu/opt: add AV_OPT_VIDEO_RATE option
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-20 12:29:54 +00:00
7d29c6eebc
mips: Optimization of IIR filter function
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 12:44:32 +01:00
26f3924d78
mips: Optimization of AAC coefficients encoder functions
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 12:34:37 +01:00
17ebef2fc8
Merge commit '2c328a907978b61949fd20f7c991803174337855'
...
* commit '2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 11:24:11 +01:00
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
1c3b428114
doc/developer: fix typo in regression tests ref.
2013-03-19 17:45:53 +01:00
18f43de964
doc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texi
...
Also extends documentation for timestamp related ffmpeg options, in order
to make more apparent the fact that muxer processing may change the
timestamps values.
2013-03-19 17:31:16 +01:00
2bac6b6f5e
doc/ffmpeg-formats: reword and extend documentation for avoid_negative_ts option
...
Hopefully increase readability.
2013-03-19 17:31:16 +01:00
d275f6eda8
doc: update release_notes by taking the ones from release/1.2
2013-03-19 16:21:26 +01:00
2c328a9079
pixdesc: add a function for counting planes in a pixel format.
2013-03-19 11:12:17 +01:00
e5c32d6da7
avplay: remove the -debug option.
...
It just shadows the corresponding AVOption and prevents using named
constants.
2013-03-19 11:12:13 +01:00
9c22039c15
doc: Document the order in which avoid_negative_ts is applied compared to other timestamp options
...
Also try to document the rational behind it.
This might fix Ticket2376
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 23:19:54 +01:00
aafbfb1c2e
doc: try to improve avoid_negative_ts documentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 23:09:26 +01:00
330e440706
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
print_options: do not generate docs for options without enc or dec flags
mpeg12: do not fail on zero dimensions in the sequence header.
Conflicts:
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 17:43:43 +01:00
358628074c
print_options: do not generate docs for options without enc or dec flags
...
Those are not usable from the avtools, so mentioning them in the
manpages just confuses the reader.
2013-03-18 15:36:25 +01:00
76d1c07c89
lavfi/ebur128: add metadata injection.
2013-03-18 03:21:08 +01:00
ef3c88838e
doc/developer: Add "security fixes" to the release process steps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 22:53:28 +01:00
40ea006b76
ffmpeg: make -lavfi an alias for -filter_complex.
2013-03-17 16:24:43 +01:00
ac1cea55ad
Merge commit '23f4c5acc438366d84cacf49e33b0bcd72f04937'
...
* commit '23f4c5acc438366d84cacf49e33b0bcd72f04937':
document the release process
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 12:58:44 +01:00
e96175ad7b
ffplay: add -af option
...
Based on a patch by Stefano Sabatini <stefasab@gmail.com>:
http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:43:36 +01:00
f7ab23b0d0
ffprobe: remove deprecated frame "reference" field
2013-03-17 00:27:48 +01:00
db36ea5b5e
lavfi/settb: add support for named options
2013-03-17 00:27:33 +01:00
0407a79e41
lavfi/blackframe: add support for named options
2013-03-17 00:27:08 +01:00
356922e237
doc/filters: add bit-slicing example in lutyuv docs
2013-03-17 00:26:31 +01:00
b2098d2417
lavu/eval: add bitor and bitand functions
...
Warning note suggested by Reimar.
2013-03-17 00:22:47 +01:00
23f4c5acc4
document the release process
2013-03-16 18:00:54 +01:00
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
3b2b636a2a
lavfi: add perms and aperms filters.
2013-03-16 16:04:59 +01:00
ef4d34aa7e
filters.texi: restore mistakenly removed section name for noformat
2013-03-16 05:35:02 +01:00
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
db670e5366
lavfi/ebur128: add framelog option.
2013-03-15 02:35:26 +01:00
9bb25dbd13
examples/filtering_*: constify AVFrame * for print_frame() and display_frame() functions
2013-03-14 21:39:15 +01:00
9076a6a943
examples/filtering_audio: update to new API
...
In particular, fix crash.
2013-03-14 21:39:09 +01:00
f0da370a52
examples/filtering_video: update to new API
...
In particular, fix crash.
2013-03-14 21:39:01 +01:00
ae732640ab
lavfi/cropdetect: add support for named options
2013-03-13 20:38:54 +01:00
aeac1dae29
lavfi/fieldorder: add support to named options
2013-03-13 00:37:13 +01:00
92ca292766
lavc: extend documentation for skip_idct, skip_loop_filter, skip_frame options
2013-03-13 00:34:42 +01:00
ceac5c54dd
Remove references to the "ff" variant of buffersink.
2013-03-12 23:31:07 +01:00
5743095ca9
Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'
...
* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
avconv: print an error on applying options of the wrong type.
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
output-example: Update to use encode_video2 instead of the now dropped encode_video
Conflicts:
doc/examples/muxing.c
ffmpeg_opt.c
libavutil/atomic.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 18:10:35 +01:00
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
80e9e63c94
Merge commit '759001c534287a96dc96d1e274665feb7059145d'
...
* commit '759001c534287a96dc96d1e274665feb7059145d':
lavc decoders: work with refcounted frames.
Anton Khirnov (1):
lavc decoders: work with refcounted frames.
Clément Bœsch (47):
lavc/ansi: reset file
lavc/ansi: re-do refcounted frame changes from Anton
fraps: reset file
lavc/fraps: switch to refcounted frames
gifdec: reset file
lavc/gifdec: switch to refcounted frames
dsicinav: resolve conflicts
smc: resolve conflicts
zmbv: resolve conflicts
rpza: resolve conflicts
vble: resolve conflicts
xxan: resolve conflicts
targa: resolve conflicts
vmnc: resolve conflicts
utvideodec: resolve conflicts
tscc: resolve conflicts
ulti: resolve conflicts
ffv1dec: resolve conflicts
dnxhddec: resolve conflicts
v210dec: resolve conflicts
vp3: resolve conflicts
vcr1: resolve conflicts
v210x: resolve conflicts
wavpack: resolve conflicts
pngdec: fix compilation
roqvideodec: resolve conflicts
pictordec: resolve conflicts
mdec: resolve conflicts
tiertexseqv: resolve conflicts
smacker: resolve conflicts
vb: resolve conflicts
vqavideo: resolve conflicts
xl: resolve conflicts
tmv: resolve conflicts
vmdav: resolve conflicts
truemotion1: resolve conflicts
truemotion2: resolve conflicts
lcldec: fix compilation
libcelt_dec: fix compilation
qdrw: fix compilation
r210dec: fix compilation
rl2: fix compilation
wnv1: fix compilation
yop: fix compilation
tiff: resolve conflicts
interplayvideo: fix compilation
qpeg: resolve conflicts (FIXME/TESTME).
Hendrik Leppkes (33):
012v: convert to refcounted frames
8bps: fix compilation
8svx: resolve conflicts
4xm: resolve conflicts
aasc: resolve conflicts
bfi: fix compilation
aura: fix compilation
alsdec: resolve conflicts
avrndec: convert to refcounted frames
avuidec: convert to refcounted frames
bintext: convert to refcounted frames
cavsdec: resolve conflicts
brender_pix: convert to refcounted frames
cinepak: resolve conflicts
cinepak: avoid using AVFrame struct directly in private context
cljr: fix compilation
cpia: convert to refcounted frames
cscd: resolve conflicts
iff: resolve conflicts and do proper conversion to refcounted frames
4xm: fix reference frame handling
cyuv: fix compilation
dxa: fix compilation
eacmv: fix compilation
eamad: fix compilation
eatgv: fix compilation
escape124: remove unused variable.
escape130: convert to refcounted frames
evrcdec: convert to refcounted frames
exr: convert to refcounted frames
mvcdec: convert to refcounted frames
paf: properly free the frame data on decode close
sgirle: convert to refcounted frames
lavfi/moviesrc: use refcounted frames
Michael Niedermayer (56):
Merge commit '759001c534287a96dc96d1e274665feb7059145d'
resolve conflicts in headers
motion_est: resolve conflict
mpeg4videodec: fix conflicts
dpcm conflict fix
dpx: fix conflicts
indeo3: resolve confilcts
kmvc: resolve conflicts
kmvc: resolve conflicts
h264: resolve conflicts
utils: resolve conflicts
rawdec: resolve conflcits
mpegvideo: resolve conflicts
svq1enc: resolve conflicts
mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
pthreads: resolve conflicts
frame_thread_encoder: simple compilefix not yet tested
snow: update to buffer refs
crytsalhd: fix compile
dirac: switch to new API
sonic: update to new API
svq1: resolve conflict, update to new API
ffwavesynth: update to new buffer API
g729: update to new API
indeo5: fix compile
j2kdec: update to new buffer API
linopencore-amr: fix compile
libvorbisdec: update to new API
loco: fix compile
paf: update to new API
proresdec: update to new API
vp56: update to new api / resolve conflicts
xface: convert to refcounted frames
xan: fix compile&fate
v408: update to ref counted buffers
v308: update to ref counted buffers
yuv4dec: update to ref counted buffers
y41p: update to ref counted frames
xbm: update to refcounted frames
targa_y216: update to refcounted buffers
qpeg: fix fate/crash
cdxl: fix fate
tscc: fix reget buffer useage
targa_y216dec: fix style
msmpeg4: fix fate
h264: ref_picture() copy fields that have been lost too
update_frame_pool: use channel field
h264: Put code that prevents deadlocks back
mpegvideo: dont allow last == current
wmalossless: fix buffer ref messup
ff_alloc_picture: free tables in case of dimension mismatches
h264: fix null pointer dereference and assertion failure
frame_thread_encoder: update to bufrefs
ec: fix used arrays
snowdec: fix off by 1 error in dimensions check
h264: disallow single unpaired fields as references of frames
Paul B Mahol (2):
lavc/vima: convert to refcounted frames
sanm: convert to refcounted frames
Conflicts:
libavcodec/4xm.c
libavcodec/8bps.c
libavcodec/8svx.c
libavcodec/aasc.c
libavcodec/alsdec.c
libavcodec/anm.c
libavcodec/ansi.c
libavcodec/avs.c
libavcodec/bethsoftvideo.c
libavcodec/bfi.c
libavcodec/c93.c
libavcodec/cavsdec.c
libavcodec/cdgraphics.c
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/dsicinav.c
libavcodec/dvdec.c
libavcodec/dxa.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c
libavcodec/error_resilience.c
libavcodec/escape124.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/huffyuvdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/jvdec.c
libavcodec/kgv1dec.c
libavcodec/kmvc.c
libavcodec/lagarith.c
libavcodec/libopenjpegdec.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mmvideo.c
libavcodec/motion_est.c
libavcodec/motionpixels.c
libavcodec/mpc7.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/nuv.c
libavcodec/options_table.h
libavcodec/pcx.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/pthread.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/r210dec.c
libavcodec/rawdec.c
libavcodec/roqvideodec.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavcodec/targa.c
libavcodec/tiertexseqv.c
libavcodec/tiff.c
libavcodec/tmv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
libavcodec/tscc.c
libavcodec/ulti.c
libavcodec/utils.c
libavcodec/utvideodec.c
libavcodec/v210dec.c
libavcodec/v210x.c
libavcodec/vb.c
libavcodec/vble.c
libavcodec/vcr1.c
libavcodec/vmdav.c
libavcodec/vmnc.c
libavcodec/vp3.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 03:23:28 +01:00
35135a3989
lavfi/smartblur: add support to named options
2013-03-10 16:38:45 +01:00
cb2bd91413
ffmpeg: add the -canvas_size option.
...
Allows, amongst other things, to override the size guessed
by the sub2video hack.
Note: the -s option could have more or less the same semantic,
but it receives a special treatment by the options system.
2013-03-10 13:48:49 +01:00
f185a040b0
doc/ffplay,ffmpeg: mention the corresponding negated option for -stats
...
This helps lazy users who didn't read the part about boolean options, in
case they grep for "-nostats".
-stdin and -stats are the only booleans option enabled by default. This
is a partial fix for Trac ticket #2332 , a complete overhaul of boolean
options documentation is probably overkill.
2013-03-10 13:22:59 +01:00
65fc80f012
lavfi: add curves filter.
2013-03-10 03:00:10 +01:00
5e4bc96415
doc: fix examples.
2013-03-10 01:41:53 +01:00
a05a44e205
Merge commit '7e350379f87e7f74420b4813170fe808e2313911'
...
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534
2013-03-10 01:40:35 +01:00
6c17ff84ad
Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'
...
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
Use the avstring.h locale-independent character type functions
avstring: Add locale independent versions of some ctype.h functions
Conflicts:
avprobe.c
doc/APIchanges
libavcodec/dvdsubdec.c
libavcodec/utils.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/eval.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 14:57:41 +01:00
d8b31be6ca
Add the bumps and APIchanges entries for reference counted buffers changes.
2013-03-08 07:41:49 +01:00
759001c534
lavc decoders: work with refcounted frames.
2013-03-08 07:38:30 +01:00
7e350379f8
lavfi: switch to AVFrame.
...
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it
and use AVFrame instead.
2013-03-08 07:37:18 +01:00
12c5c1d3e3
avstring: Add locale independent versions of some ctype.h functions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-07 15:16:26 +02:00
d95143ec82
lavf/segment: add support to ffconcat segment list
2013-03-07 01:44:59 +01:00
9167db3829
doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields
...
Fix potential spurious substitution.
2013-03-07 01:44:59 +01:00
9767ec6b86
lavu: add escape API
...
The escape API will be useful to perform escaping programmatically, which
is required when crafting argument strings, and will be used for context
printing as well.
This is based on the ffescape tool code, with a few extensions and fixes.
2013-03-07 01:12:04 +01:00
87a954d6f4
lavf/concat: document the use of the files durations.
...
Address trac ticket #2319 .
2013-03-06 16:58:38 +01:00
34d0ea5247
lavfi/deshake: support named options.
2013-03-05 21:16:54 +01:00
c0bfc2b90d
doc/filters: make examples a bit more consistent.
...
Create dedicated subsection and itemize. Not done for every filters, but
a large part is done.
2013-03-05 21:08:19 +01:00
72d2e9437d
doc/showspectrum: add some examples.
2013-03-05 20:37:58 +01:00
3f35f36a2e
lavfi: port MP stereo3d filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-05 18:36:40 +00:00
9b211c43dc
examples/muxing: fix memory leak.
...
Do not re-call avcodec_get_context_defaults3(), it is already
called by avformat_new_stream() and it leaks the codec
priv_data that was already allocated.
Use avformat_free_context() instead of freeing (not)
everything manually.
Fix trac ticket #2322 .
2013-03-05 15:43:32 +01:00
622a6f6f3b
doc/muxers: specify that tee needs -map.
...
Address trac ticket #2311 .
2013-03-05 14:20:18 +01:00
f5ce359ce4
doc/filters: fix short options for noise filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-05 10:18:21 +00:00
16ed6a6bf7
doc/filters: fix degrees/radians copy/paste fail.
2013-03-03 23:49:46 +01:00
Paul B Mahol
Nicolas George
Clément Bœsch
Michael Niedermayer
highgod0401
Anton Khirnov
Matthieu Bouron
Stefano Sabatini
Reinhard Tartler
Derek Buitenhuis
Timothy Gu
Luca Barbato
Bojan Zivkovic
Giorgio Vazzana
Diego Biurrun
Marton Balint
Reimar Döffinger