RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

doc: make x11grab examples consistent with option names 

Change -r to -framerate, but either will work.
Change -s to -video_size, but either will work.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
This commit is contained in:
Lou Logan 2013-10-12 16:40:22 -08:00 committed by Stefano Sabatini
parent d6f86d74ed
commit a06dcde507
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ffmpeg.texi
View File

@ -1215,14 +1215,14 @@ standard mixer.
Grab the X11 display with ffmpeg via Grab the X11 display with ffmpeg via
@example @example
ffmpeg -f x11grab -s cif -r 25 -i :0.0 /tmp/out.mpg ffmpeg -f x11grab -video_size cif -framerate 25 -i :0.0 /tmp/out.mpg
@end example @end example
0.0 is display.screen number of your X11 server, same as 0.0 is display.screen number of your X11 server, same as
the DISPLAY environment variable. the DISPLAY environment variable.
@example @example
ffmpeg -f x11grab -s cif -r 25 -i :0.0+10,20 /tmp/out.mpg ffmpeg -f x11grab -video_size cif -framerate 25 -i :0.0+10,20 /tmp/out.mpg
@end example @end example
0.0 is display.screen number of your X11 server, same as the DISPLAY environment 0.0 is display.screen number of your X11 server, same as the DISPLAY environment

12
doc/indevs.texi
View File

@ -698,12 +698,12 @@ properties of your X11 display (e.g. grep for "name" or "dimensions").
For example to grab from @file{:0.0} using @command{ffmpeg}: For example to grab from @file{:0.0} using @command{ffmpeg}:
@example @example
ffmpeg -f x11grab -r 25 -s cif -i :0.0 out.mpg ffmpeg -f x11grab -framerate 25 -video_size cif -i :0.0 out.mpg
@end example @end example
Grab at position @code{10,20}: Grab at position @code{10,20}:
@example @example
ffmpeg -f x11grab -r 25 -s cif -i :0.0+10,20 out.mpg ffmpeg -f x11grab -framerate 25 -video_size cif -i :0.0+10,20 out.mpg
@end example @end example
@subsection Options @subsection Options
@ -724,12 +724,12 @@ zero) to the edge of region.
For example: For example:
@example @example
ffmpeg -f x11grab -follow_mouse centered -r 25 -s cif -i :0.0 out.mpg ffmpeg -f x11grab -follow_mouse centered -framerate 25 -video_size cif -i :0.0 out.mpg
@end example @end example
To follow only when the mouse pointer reaches within 100 pixels to edge: To follow only when the mouse pointer reaches within 100 pixels to edge:
@example @example
ffmpeg -f x11grab -follow_mouse 100 -r 25 -s cif -i :0.0 out.mpg ffmpeg -f x11grab -follow_mouse 100 -framerate 25 -video_size cif -i :0.0 out.mpg
@end example @end example
@item framerate @item framerate
@ -745,12 +745,12 @@ know what is being grabbed if only a portion of the screen is grabbed.
For example: For example:
@example @example
ffmpeg -f x11grab -show_region 1 -r 25 -s cif -i :0.0+10,20 out.mpg ffmpeg -f x11grab -show_region 1 -framerate 25 -video_size cif -i :0.0+10,20 out.mpg
@end example @end example
With @var{follow_mouse}: With @var{follow_mouse}:
@example @example
ffmpeg -f x11grab -follow_mouse centered -show_region 1 -r 25 -s cif -i :0.0 out.mpg ffmpeg -f x11grab -follow_mouse centered -show_region 1 -framerate 25 -video_size cif -i :0.0 out.mpg
@end example @end example
@item video_size @item video_size