h264: discard slices of redundant pictures right after parsing the slice header

[ffmpeg] / doc / indevs.texi

diff --git a/doc/indevs.texi b/doc/indevs.texi
index 4405a5b0a1ad4a2d02c7aea9af773ed78bd575da..a08c7a5f6ba72cb16edecb76671c64203c49c35b 100644 (file)
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -13,7 +13,7 @@ You can disable all the input devices using the configure option
 option "--enable-indev=@var{INDEV}", or you can disable a particular
 input device using the option "--disable-indev=@var{INDEV}".
 
-The option "-formats" of the ff* tools will display the list of
+The option "-formats" of the av* tools will display the list of
 supported input devices (amongst the demuxers).
 
 A description of the currently available input devices follows.
@@ -254,9 +254,9 @@ command:
 avconv -f sndio -i /dev/audio0 /tmp/oss.wav
 @end example
 
-@section video4linux and video4linux2
+@section video4linux2
 
-Video4Linux and Video4Linux2 input video devices.
+Video4Linux2 input video device.
 
 The name of the device to grab is a file device node, usually Linux
 systems tend to automatically create such nodes when the device
@@ -264,33 +264,22 @@ systems tend to automatically create such nodes when the device
 kind @file{/dev/video@var{N}}, where @var{N} is a number associated to
 the device.
 
-Video4Linux and Video4Linux2 devices only support a limited set of
+Video4Linux2 devices usually support a limited set of
 @var{width}x@var{height} sizes and framerates. You can check which are
-supported for example with the command @file{dov4l} for Video4Linux
-devices and the command @file{v4l-info} for Video4Linux2 devices.
+supported using @command{-list_formats all} for Video4Linux2 devices.
 
-If the size for the device is set to 0x0, the input device will
-try to autodetect the size to use.
-Only for the video4linux2 device, if the frame rate is set to 0/0 the
-input device will use the frame rate value already set in the driver.
+Some usage examples of the video4linux2 devices with avconv and avplay:
 
-Video4Linux support is deprecated since Linux 2.6.30, and will be
-dropped in later versions.
-
-Follow some usage examples of the video4linux devices with the ff*
-tools.
 @example
-# Grab and show the input of a video4linux device, frame rate is set
-# to the default of 25/1.
-avplay -s 320x240 -f video4linux /dev/video0
+# List supported formats for a video4linux2 device.
+avplay -f video4linux2 -list_formats all /dev/video0
 
-# Grab and show the input of a video4linux2 device, autoadjust size.
-avplay -f video4linux2 /dev/video0
+# Grab and show the input of a video4linux2 device.
+avplay -f video4linux2 -framerate 30 -video_size hd720 /dev/video0
 
-# Grab and record the input of a video4linux2 device, autoadjust size,
-# frame rate value defaults to 0/0 so it is read from the video4linux2
-# driver.
-avconv -f video4linux2 -i /dev/video0 out.mpeg
+# Grab and record the input of a video4linux2 device, leave the
+framerate and size as previously set.
+avconv -f video4linux2 -input_format mjpeg -i /dev/video0 out.mpeg
 @end example
 
 @section vfwcap
@@ -314,7 +303,7 @@ The filename passed as input has the syntax:
 
 @var{hostname}:@var{display_number}.@var{screen_number} specifies the
 X11 display name of the screen to grab from. @var{hostname} can be
-ommitted, and defaults to "localhost". The environment variable
+omitted, and defaults to "localhost". The environment variable
 @env{DISPLAY} contains the default display name.
 
 @var{x_offset} and @var{y_offset} specify the offsets of the grabbed
@@ -373,4 +362,14 @@ avconv -f x11grab -show_region 1 -r 25 -s cif -i :0.0+10,20 out.mpg
 avconv -f x11grab -follow_mouse centered -show_region 1  -r 25 -s cif -i :0.0 out.mpg
 @end example
 
+@subsection @var{grab_x} @var{grab_y} AVOption
+
+The syntax is:
+@example
+-grab_x @var{x_offset} -grab_y @var{y_offset}
+@end example
+
+Set the grabbing region coordinates. The are expressed as offset from the top left
+corner of the X11 window. The default value is 0.
+
 @c man end INPUT DEVICES