virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
62,802 Commits 37 Branches 400 Tags 458 MiB
50ed6e3ce6
Commit Graph

915 Commits

Author SHA1 Message Date
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
Clément Bœsch
f21d0beb0c Fix a few heigth/height typo. 2014-02-07 09:33:56 +01:00
Michael Niedermayer
905cd28a5a Merge commit 'de203abd71baae7f120313259b45cf935c85203e' 
* commit 'de203abd71baae7f120313259b45cf935c85203e':
  vf_overlay: add eof_action switch

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-04 14:33:33 +01:00
Keith Lawson
de203abd71 vf_overlay: add eof_action switch 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-04 10:54:26 +01:00
Jean First
2384cada12 lavfi/ebur128: add true peak metering per frame 
Signed-off-by: Jean First <jeanfirst@gmail.com>
 2014-02-02 20:45:09 +01:00
Jean First
6ef2315aaf lavfi/ebur128: print peak metering in dBFS 
Signed-off-by: Jean First <jeanfirst@gmail.com>
 2014-02-02 20:45:09 +01:00
Clément Bœsch
7f42bfad5d lavfi/ebur128: add sample and true peak metering. 
Metadata injection and logging. Not yet present visually.

Signed-off-by: Jean First <jeanfirst@gmail.com>
 2014-02-02 20:44:56 +01:00
Stefano Sabatini
a270f63e83 lavfi/overlay: add yuv422 format mode 2014-02-02 11:50:21 +01:00
Stefano Sabatini
68c5ba1f05 doc/filters: re-edit notes on filtergraph escaping 
State the escaping rules more explicitly, reword various sentences and
drop confusing quoting example.

Should fix trac issue #3334.
 2014-01-26 18:06:39 +01:00
Lars Kiesow
c49b036096 Documentation for scale filter factor 2014-01-25 15:34:23 +01:00
Ramiro Polla
78a9f185eb lavfi/drawtext: add option for drawing border around text 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 04:59:28 +01:00
Ramiro Polla
222fb8276d lavfi/drawtext: get bitmap from glyph in a separate step 
This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 04:46:38 +01:00
Stefano Sabatini
3dc494f8b9 lavfi/vidstabtransform: apply various documentation/option minor fixes 
Improve consistency with the rest of the documentation.
 2014-01-19 12:20:10 +01:00
Georg Martius
2727dbb053 lavfi/vidstabdetect,vidstabtransform: update to vid.stab 0.98 
In particular:
* set default value for accuracy to 15 (max)
* add zoomspeed for dynamic zoom (optzoom=2)
* make camera path optimization algorithm configurable
* update optzoom documenation in code to use new localmotions calculation function commandline arguments
* add debug option in vidstabtransform

Signed-off-by: Georg Martius <martius@mis.mpg.de>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-01-16 12:23:48 +01:00
Michael Niedermayer
402a411406 Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
  lavfi: add framepack filter

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 03:00:48 +01:00
Vittorio Giovara
a7d0e7ead9 lavfi: add framepack filter 2014-01-09 23:13:05 +01:00
Lou Logan
00bef6431e doc/filters: add rotate example using degrees 2014-01-09 00:39:16 +01:00
Werner Robitza
53df11eb73 doc/filters/equalizer: add examples for equalizer 
Add two examples on the usage of the equalizer filter.
 2014-01-07 21:10:53 +01:00
Stefano Sabatini
97aa554634 lavfi/volume: implement process_command() callback, with the volume command 
Address trac ticket #2868.
 2013-12-25 18:25:53 +01:00
Stefano Sabatini
7619a87cc8 lavfi/volume: support volume expression and per-frame expression evaluation 
The eval mode allows to evaluate the expression per-frame or just at
init.

In particular, address ticket #3234.
 2013-12-25 18:25:04 +01:00
Carl Eugen Hoyos
aae5c4d40e doc: Fix adelay example. 
Fixes ticket #3211.
 2013-12-09 23:56:23 +01:00
Stefano Sabatini
e424abc3a0 lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
Stefano Sabatini
405b3eb535 lavfi/aevalsrc: duplicate last expression for the missing channels 
Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.
 2013-12-06 10:51:12 +01:00
Michael Niedermayer
c0caf7e814 Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1' 
* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
  filter docs: reference scale and fps filters

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 19:09:12 +01:00
Vittorio Giovara
dd249245d0 filter docs: reference scale and fps filters 2013-11-21 14:48:40 +01:00
Clément Bœsch
9c8b240806 avfilter/showspectrum: add blackman window. 2013-11-20 16:35:48 +01:00
Clément Bœsch
3e69f7c221 avfilter/showspectrum: add win_func option. 2013-11-20 16:22:05 +01:00
Stefano Sabatini
8cd3685a3f lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
Lou Logan
6d90a5c149 Fix example in pullup documentation. 
The pullup filter does not work well with the fps filter, it
currently needs -r

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-11-12 14:22:15 +01:00