[FFmpeg-cvslog] doc: Add muxers/demuxers list option
ffmpeg | branch: master | Mulvya | Fri Feb 10 17:28:14 2017
+0530| [40b6e28778653d1f16dc650d841d9adedc781bea] | committer: Michael
Niedermayer
doc: Add muxers/demuxers list option
Signed-off-by: Mulvya
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40b6e28778653d1f16dc650d841d9adedc781bea
---
doc/demuxers.texi| 5 +++--
doc/ffmpeg.texi | 2 +-
doc/fftools-common-opts.texi | 6 ++
doc/muxers.texi | 5 +++--
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index c12c07e..29a23d4 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -13,8 +13,9 @@ You can disable all the demuxers using the configure option
the option @code{--enable-demuxer=@var{DEMUXER}}, or disable it
with the option @code{--disable-demuxer=@var{DEMUXER}}.
-The option @code{-formats} of the ff* tools will display the list of
-enabled demuxers.
+The option @code{-demuxers} of the ff* tools will display the list of
+enabled demuxers. Use @code{-formats} to view a combined list of
+enabled demuxers and muxers.
The description of some of the currently available demuxers follows.
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 996d6a6..11b527d 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1547,7 +1547,7 @@ to enable LAME support by passing
@code{--enable-libmp3lame} to configure.
The mapping is particularly useful for DVD transcoding
to get the desired audio language.
-NOTE: To see the supported input formats, use @code{ffmpeg -formats}.
+NOTE: To see the supported input formats, use @code{ffmpeg -demuxers}.
@item
You can extract images from a video, or create a video from many images:
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index a8e485f..7269aee 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -110,6 +110,12 @@ Show version.
@item -formats
Show available formats (including devices).
+@item -demuxers
+Show available demuxers.
+
+@item -muxers
+Show available muxers.
+
@item -devices
Show available devices.
diff --git a/doc/muxers.texi b/doc/muxers.texi
index cb875a4..6a9505e 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -13,8 +13,9 @@ You can disable all the muxers with the configure option
with the options @code{--enable-muxer=@var{MUXER}} /
@code{--disable-muxer=@var{MUXER}}.
-The option @code{-formats} of the ff* tools will display the list of
-enabled muxers.
+The option @code{-muxers} of the ff* tools will display the list of
+enabled muxers. Use @code{-formats} to view a combined list of
+enabled demuxers and muxers.
A description of some of the currently available muxers follows.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc: correct table end for metadata filter
ffmpeg | branch: master | Mulvya | Thu Feb 16 00:50:27 2017
+0530| [449ce456a6c9c9dda70be04aa7aa45025732f563] | committer: Paul B Mahol
doc: correct table end for metadata filter
Signed-off-by: Mulvya
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=449ce456a6c9c9dda70be04aa7aa45025732f563
---
doc/filters.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 89eb7ac..cff7ea5 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -16400,13 +16400,13 @@ Float representation of @code{value} from metadata
key.
@item VALUE2
Float representation of @code{value} as supplied by user in @code{value}
option.
+@end table
@item file
If specified in @code{print} mode, output is written to the named file.
Instead of
plain filename any writable url can be specified. Filename ``-'' is a shorthand
for standard output. If @code{file} option is not set, output is written to
the log
with AV_LOG_INFO loglevel.
-@end table
@end table
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc: correct order of options for channelmap filter
ffmpeg | branch: master | Mulvya | Fri Feb 17 00:45:32 2017
+0530| [64b79535d7c4390c9da0422c4394cc9e0fa04f85] | committer: Lou Logan
doc: correct order of options for channelmap filter
Signed-off-by: Mulvya
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64b79535d7c4390c9da0422c4394cc9e0fa04f85
---
doc/filters.texi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index cff7ea5..60c0c82 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1905,9 +1905,6 @@ Remap input channels to new locations.
It accepts the following parameters:
@table @option
-@item channel_layout
-The channel layout of the output stream.
-
@item map
Map channels from input to output. The argument is a '|'-separated list of
mappings, each in the @code{@var{in_channel}-@var{out_channel}} or
@@ -1916,6 +1913,9 @@ channel (e.g. FL for front left) or its index in the
input channel layout.
@var{out_channel} is the name of the output channel or its index in the output
channel layout. If @var{out_channel} is not given then it is implicitly an
index, starting with zero and increasing by one for each mapping.
+
+@item channel_layout
+The channel layout of the output stream.
@end table
If no mapping is present, the filter will implicitly map input channels to
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc: drawtext options update
ffmpeg | branch: master | Mulvya | Sun Feb 19 22:10:15 2017
+0530| [8b768f68b054a5c8d5b094f3816e2ce319bf764c] | committer: Lou Logan
doc: drawtext options update
Remove nonexistant "draw" option.
Add undocumented "tc24hmax" timecode wrap option.
Signed-off-by: Mulvya
Signed-off-by: Lou Logan
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b768f68b054a5c8d5b094f3816e2ce319bf764c
---
doc/filters.texi | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 60c0c82..9c8410f 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -6770,6 +6770,12 @@ Select how the @var{text} is expanded. Can be either
@code{none},
@code{normal} (default). See the @ref{drawtext_expansion, Text expansion}
section
below for details.
+@item basetime
+Set a start time for the count. Value is in microseconds. Only applied
+in the deprecated strftime expansion mode. To emulate in normal expansion
+mode use the @code{pts} function, supplying the start time (in seconds)
+as the second argument.
+
@item fix_bounds
If true, check and fix text coords to avoid clipping.
@@ -6791,9 +6797,6 @@ The font family to be used for drawing text. By default
Sans.
The font file to be used for drawing text. The path must be included.
This parameter is mandatory if the fontconfig support is disabled.
-@item draw
-This option does not exist, please see the timeline system
-
@item alpha
Draw the text applying alpha blending. The value can
be a number between 0.0 and 1.0.
@@ -6867,6 +6870,10 @@ option must be specified.
@item timecode_rate, rate, r
Set the timecode frame rate (timecode only).
+@item tc24hmax
+If set to 1, the output of the timecode option will wrap around at 24 hours.
+Default is 0 (disabled).
+
@item text
The text string to be drawn. The text must be a sequence of UTF-8
encoded characters.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/filters: blend terminates on longest input
ffmpeg | branch: master | Mulvya | Sat Sep 24 09:23:27 2016
+0530| [a54c3ff65f87e785ede4f74e9e09b73d2685d019] | committer: Lou Logan
doc/filters: blend terminates on longest input
Signed-off-by: Mulvya
Signed-off-by: Lou Logan
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a54c3ff65f87e785ede4f74e9e09b73d2685d019
---
doc/filters.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 7aa541f..9d51757 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4534,7 +4534,7 @@ Blend two video frames into each other.
The @code{blend} filter takes two input streams and outputs one
stream, the first input is the "top" layer and second input is
-"bottom" layer. Output terminates when shortest input terminates.
+"bottom" layer. By default, the output terminates when the longest input
terminates.
The @code{tblend} (time blend) filter takes two consecutive frames
from one single stream, and outputs the result obtained by blending
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/filters: add drawtext example
ffmpeg | branch: master | Mulvya | Sun Apr 3 14:45:01 2016
+0530| [b7a776aa7bb6efe8a757ab899fb5046bee1120f0] | committer: Lou Logan
doc/filters: add drawtext example
Show example which draws text at a random position, and switches positions
every 30 seconds
Signed-off-by: Mulvya
Signed-off-by: Lou Logan
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7a776aa7bb6efe8a757ab899fb5046bee1120f0
---
doc/filters.texi |6 ++
1 file changed, 6 insertions(+)
diff --git a/doc/filters.texi b/doc/filters.texi
index 0b2a9b6..82be06d 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -6557,6 +6557,12 @@ drawtext="fontsize=30:fontfile=FreeSerif.ttf:text='hello
world':x=(w-text_w)/2:y
@end example
@item
+Show the text at a random position, switching to a new position every 30
seconds:
+@example
+drawtext="fontsize=30:fontfile=FreeSerif.ttf:text='hello
world':x=if(eq(mod(t\,30)\,0)\,rand(0\,(w-text_w))\,x):y=if(eq(mod(t\,30)\,0)\,rand(0\,(h-text_h))\,y)"
+@end example
+
+@item
Show a text line sliding from right to left in the last row of the video
frame. The file @file{LONG_LINE} is assumed to contain a single line
with no newlines.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
