From d9d547063648862c141508f816ef1242570c3fb9 Mon Sep 17 00:00:00 2001 From: rogerdpack Date: Mon, 15 Oct 2012 11:24:08 -0600 Subject: [PATCH 1/4] docu: fix flite example Signed-off-by: rogerdpack --- doc/ffmpeg.texi | 2 +- doc/filters.texi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 767ce59a69..e73ef25986 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -58,7 +58,7 @@ options apply ONLY to the next input or output file and are reset between files. @item To set the video bitrate of the output file to 64kbit/s: @example -ffmpeg -i input.avi -b:v 64k output.avi +ffmpeg -i input.avi -b:v 64k -bufsize 64k output.avi @end example @item diff --git a/doc/filters.texi b/doc/filters.texi index 725c7b5d84..95dcbf279e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1141,7 +1141,7 @@ flite=text='So fare thee well, poor devil of a Sub-Sub, whose commentator I am': Make @file{ffplay} speech the specified text, using @code{flite} and the @code{lavfi} device: @example -ffplay -f lavfi flite='No more be grieved for which that thou hast done.' +ffplay -f lavfi flite=text='No more be grieved for which that thou hast done.' @end example @end itemize From 7f5a78a0da8e310e67431844d57cceb46d726dbb Mon Sep 17 00:00:00 2001 From: rogerdpack Date: Mon, 15 Oct 2012 11:26:07 -0600 Subject: [PATCH 2/4] docu: add flite ffmpeg example Signed-off-by: rogerdpack --- doc/filters.texi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 95dcbf279e..c9b3b45bd0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1137,6 +1137,12 @@ Read the specified text selecting the @code{slt} voice: flite=text='So fare thee well, poor devil of a Sub-Sub, whose commentator I am':voice=slt @end example +@item +Input text to ffmpeg: +@example +ffmpeg -f lavfi -i flite=text='So fare thee well, poor devil of a Sub-Sub, whose commentator I am':voice=slt +@end example + @item Make @file{ffplay} speech the specified text, using @code{flite} and the @code{lavfi} device: From a8eaa9ebc670ffa0dfc008d032c5239ab2d10ced Mon Sep 17 00:00:00 2001 From: rogerdpack Date: Mon, 15 Oct 2012 11:26:39 -0600 Subject: [PATCH 3/4] docu: change verb flite Signed-off-by: rogerdpack --- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index c9b3b45bd0..938372c826 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1144,7 +1144,7 @@ ffmpeg -f lavfi -i flite=text='So fare thee well, poor devil of a Sub-Sub, whose @end example @item -Make @file{ffplay} speech the specified text, using @code{flite} and +Make @file{ffplay} speak the specified text, using @code{flite} and the @code{lavfi} device: @example ffplay -f lavfi flite=text='No more be grieved for which that thou hast done.' From dfd085aae2a1ffe02686794140a0f9ee5ddf8386 Mon Sep 17 00:00:00 2001 From: rogerdpack Date: Mon, 15 Oct 2012 11:28:45 -0600 Subject: [PATCH 4/4] docu: add word resize to scale filter, to make searching for the word resize simpler Signed-off-by: rogerdpack --- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 938372c826..c564c269f1 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2999,7 +2999,7 @@ pixels will slow things down on a large logo. @section scale -Scale the input video to @var{width}:@var{height}[:@var{interl}=@{1|-1@}] and/or convert the image format. +Scale (resize) the input video to @var{width}:@var{height}[:@var{interl}=@{1|-1@}] and/or convert the image format. The scale filter forces the output display aspect ratio to be the same of the input, by changing the output sample aspect ratio.