generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
52,697 Commits 24 Branches 241 Tags 173 MiB
9fd5e75bdf
Commit Graph

3498 Commits

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