aboutsummaryrefslogtreecommitdiffstats
path: root/doc/avconv.texi
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-03 19:21:00 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-23 11:55:53 +0100
commit7671dd7cd7d51bbd637cc46d8f104a141bc355ea (patch)
tree894b4ff07c05f8cb2d7b2f266335b3c3fe9f8d56 /doc/avconv.texi
parent07fd0a22192805d56c635eb294dc26b0a54ae325 (diff)
downloadffmpeg-7671dd7cd7d51bbd637cc46d8f104a141bc355ea.tar.gz
avconv: add support for VDPAU decoding
Diffstat (limited to 'doc/avconv.texi')
-rw-r--r--doc/avconv.texi9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 40c105cc15..972d13fed5 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -562,6 +562,9 @@ Do not use any hardware acceleration (the default).
@item auto
Automatically select the hardware acceleration method.
+
+@item vdpau
+Use VDPAU (Video Decode and Presentation API for Unix) hardware acceleration.
@end table
This option has no effect if the selected hwaccel is not available or not
@@ -579,6 +582,12 @@ Select a device to use for hardware acceleration.
This option only makes sense when the @option{-hwaccel} option is also
specified. Its exact meaning depends on the specific hardware acceleration
method chosen.
+
+@table @option
+@item vdpau
+For VDPAU, this option specifies the X11 display/screen to use. If this option
+is not specified, the value of the @var{DISPLAY} environment variable is used
+@end table
@end table
@section Audio Options