ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-01 18:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,338 Commits 37 Branches 400 Tags 502 MiB
6786848585
Commit Graph

943 Commits

Author SHA1 Message Date
mrskman
6f3e15af84 avfilter/avf_showwaves: New p2p mode for showwaves filter 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 14:12:35 +02:00
Michael Niedermayer
c87f645a75 Merge commit '52269f48e835a52023656f8330262ae70e6061c4' 
* commit '52269f48e835a52023656f8330262ae70e6061c4':
  Revert "vf_interlace: deprecate lowpass option"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 16:39:28 +02:00
Vittorio Giovara
52269f48e8 Revert "vf_interlace: deprecate lowpass option" 
This reverts commit 35b05c5184.
A warning is introduced in case this option is used.
 2014-08-01 13:02:29 +01:00
Andrey Utkin
cb8cb85da7 lavfi/drawtext: add alias "expr_int_format" to expansion function "eif" 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-18 14:24:34 +02:00
Stefano Sabatini
3babbf3bf4 doc/filters/drawtext: simplify example, use clip() eval function 2014-07-17 12:44:36 +02:00
Andrey Utkin
e9ff5df0b5 lavfi/drawtext: add fontcolor_expr option 
Allow to dynamically evaluate the font color.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-07-17 12:42:56 +02:00
Andrey Utkin
dec87454de lavfi/drawtext: add expansion function eif() 
It evaluates expression and outputs it as integer value, using specified
format.

Address trac ticket #3699.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-07-17 11:29:43 +02:00
Marc Jeffreys
a0b71e9f3e avfilter/drawtext: Add basic text shaping using libfribidi 
Fixes ticket #3758

Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-16 00:40:39 +02:00
Muhammad Faiz
860d12978c doc/filters: fixing typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 10:43:27 +02:00
Andreas Cadhalpun
39a6e02fd4 fix spelling errors 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 22:33:27 +02:00
Dave Rice
a15c5c44e2 doc/filters: add a signalstats example 
Signed-off-by: Dave Rice <dave@dericed.com>
 2014-07-10 09:34:37 +00:00
Paul B Mahol
b52c26c66f avfilter: add flanger filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-03 08:07:42 +00:00
Dave Rice
1619a0e2b8 doc/filters: fix typo 
Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 13:09:12 +02:00
Muhammad Faiz
46563af79c avfilter/showcqt: adding freetype support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 21:53:14 +02:00
Clément Bœsch
ded3c9fd32 avfilter: add hqx filter (hq2x, hq3x, hq4x) 
Partially fixes Ticket #3404 (xbr filter remaining)
 2014-06-21 19:22:55 +02:00
Lou Logan
3fc37a3d2f doc/filters: remove double quotes from zoompan example 
Based on suggested change by Clément Bœsch.

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 12:52:40 -08:00
Muhammad Faiz
0a64fb7fb0 avfilter/avf_showcqt: add option for lower resolution 
Resolution can be 1920x1080 or 960x540.
 2014-06-12 09:16:08 +00:00
Lou Logan
edeefeaaf9 doc/filters: add forgotten " to zoompan example 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-06-11 12:01:05 -08:00
Clément Bœsch
76bce46d8f avfilter: add signalstats filter 
Signed-off-by: Mark Heath <silicontrip@gmail.com>
Signed-off-by: Dave Rice <dave@dericed.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-06-11 21:17:24 +02:00
Paul B Mahol
4b6cb1cc69 Zoom & Pan filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-06-09 12:41:33 +00:00
Muhammad Faiz
40e938a7ed avfilter: new multimedia filter avf_showcqt.c 
this filter is the same as showspectrum but with constant Q transform,
so frequency is spaced logarithmically
 2014-06-05 14:04:01 +02:00
Lou Logan
8a64ea768b doc/filters: amix only supports float samples 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-05-27 10:23:57 -08:00
Michael Niedermayer
aedc1c2ed6 doc/filters: fix typo 
Found-by: bloody123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-17 04:57:35 +02:00
Clément Bœsch
b17e98ded0 avfilter/edgedetect: add a colormix mode. 2014-05-03 19:07:14 +02:00
Michael Niedermayer
154d80eae7 Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e' 
* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
  lavfi: add Bauer stereo-to-binaural audio filter

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 14:14:10 +02:00
ValdikSS
7a0e689c45 lavfi/subtitles: introduce stream_index 
Signed-off-by: ValdikSS <iam@valdikss.org.ru>
 2014-05-01 12:52:33 +02:00
Alessandro Ghedini
1c0210c798 lavfi: add Bauer stereo-to-binaural audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-05-01 08:00:30 +02:00
Nicolas George
41334fcab4 lavfi/drawtext: allow to format pts as HH:MM:SS.mmm. 2014-04-29 13:25:59 +02:00
Michael Niedermayer
443261cbbd Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432' 
* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432':
  drawtext: Add fontconfig support

Conflicts:
	configure
	doc/filters.texi
	libavfilter/vf_drawtext.c

See: 40b7a27bad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-17 05:15:26 +02:00
Luca Barbato
f1b239ec8b drawtext: Add fontconfig support 
Introduce the `font` option and make it optional to pass a fontfile.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-17 00:41:30 +02:00
Michael Niedermayer
878f8b0d26 Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462' 
* commit 'aaab192df24a90f4450285cfb73b395cf495b462':
  af_volume: implement replaygain clipping prevention

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 14:39:51 +02:00
Alessandro Ghedini
aaab192df2 af_volume: implement replaygain clipping prevention 
This adds a new "replaygain_noclip" option to the filter, and, if enabled,
limits the gain applied for tracks where clipping would occur.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-13 11:25:06 +02:00
Michael Niedermayer
275155081f Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71' 
* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
  doc: Libavfilter English cleanup

Conflicts:
	doc/filters.texi
	doc/libavfilter.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 00:37:32 +02:00
Katerina Barone-Adesi
d4a8a86c68 doc: Libavfilter English cleanup 
This aims to standardize the English used in the libavfilter
documentation, describing the same thing in the same way more often,
and significantly reduce the amount of outright errors, including
run-on sentences and sentence fragments.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-12 14:34:11 +02:00
Nicolas George
ad8159e0fe libavfilter: Add asettb filter for setting timebase for audio 
Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.

Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-10 12:52:19 +02:00
Michael Niedermayer
37af487170 Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06' 
* commit 'a49aa440c939e221194f8d95bf98673f8cf38a06':
  af_volume: implement replaygain pre-amplification

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-05 00:16:53 +02:00
Alessandro Ghedini
a49aa440c9 af_volume: implement replaygain pre-amplification 
This adds a new "replaygain_preamp" option to the filter, and simply adds its
value to the replaygain gain value.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-04 18:53:05 +02:00
Michael Niedermayer
8de75f703a Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15' 
* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
  af_volume: support using replaygain frame side data

Conflicts:
	doc/filters.texi
	libavfilter/af_volume.c
	libavfilter/af_volume.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 15:04:47 +01:00
Anton Khirnov
06c3cd3c01 af_volume: support using replaygain frame side data 2014-03-24 06:07:51 +01:00
Andreas Cadhalpun
9898bd9a82 Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 21:12:40 +01:00
Michael Niedermayer
2fb0027c26 Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 
* commit '599b81ca9a8e04a27ddad94af462171d16063167':
  lavfi: add shuffleplanes filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 13:07:20 +01:00
Anton Khirnov
599b81ca9a lavfi: add shuffleplanes filter 2014-03-05 21:52:02 +01:00
Michael Niedermayer
5d166de258 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: add compand audio filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/af_compand.c
	libavfilter/allfilters.c
	libavfilter/version.h

The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 11:27:02 +01:00
Andrew Kelley
738f83582a lavfi: add compand audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-26 08:09:58 +01:00
Michael Niedermayer
75f6ed8dc2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: fix one accented word

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 22:29:24 +01:00
Vittorio Giovara
c91488ab33 doc: fix one accented word 2014-02-24 17:54:03 +01:00
Michael Niedermayer
b14517d3cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_interlace: deprecate lowpass option

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 16:16:41 +01:00
Vittorio Giovara
35b05c5184 vf_interlace: deprecate lowpass option 2014-02-19 12:26:34 +01:00
Nicholas Robbins
b4d308c04f lavfi: adding dejudder filter to remove judder produced by partially telecined material. 
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 17:43:58 +01:00
Werner Robitza
1ffac25d31 doc/filters/histogram: copyedit for grammar 
There were a few grammar and spelling mistakes in this filter
description. I went through it and corrected them without changing
the meaning.
 2014-02-14 15:11:46 +00:00