diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 22:26:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 22:27:20 +0200 |
| commit | e434ddd4c6997aa6185d9dbb781faa2421258f04 (patch) | |
| tree | c3a30fd8e1b68ed937980a84326e8e033bac55c7 /doc/filters.texi | |
| parent | 8bdb119197ad50a5ede2326e3c0942dc82ba1b5e (diff) | |
| parent | 9087eaf193b8ce99c41352064a81916fa66adb49 (diff) | |
| download | ffmpeg-e434ddd4c6997aa6185d9dbb781faa2421258f04.tar.gz | |
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>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 63cbf1a7c9..e1b891fab8 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -4264,9 +4264,7 @@ Overlay one video on top of another. It takes two inputs and one output, the first input is the "main" video on which the second input is overlayed. -This filter accepts a list of @var{key}=@var{value} pairs as argument, -separated by ":". If the key of the first options is omitted, the -arguments are interpreted according to the syntax @var{x}:@var{y}. +This filter accepts the following parameters: A description of the accepted options follows. @@ -4412,7 +4410,7 @@ ffmpeg -i input -i logo -filter_complex 'overlay=10:main_h-overlay_h-10' output Insert 2 different transparent PNG logos (second logo on bottom right corner) using the @command{ffmpeg} tool: @example -ffmpeg -i input -i logo1 -i logo2 -filter_complex 'overlay=10:H-h-10,overlay=W-w-10:H-h-10' output +ffmpeg -i input -i logo1 -i logo2 -filter_complex 'overlay=x=10:y=H-h-10,overlay=x=W-w-10:y=H-h-10' output @end example @item |