diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:43:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:46:48 +0100 |
| commit | 3e641b4842b8b5f6592991479d19f1a7ce846308 (patch) | |
| tree | 25bee33d11ceddf0ee1758dd8cf5763764d5fc80 /doc | |
| parent | 62e10c375968d9cbbe2a0bc321e00eef52d32917 (diff) | |
| parent | 7671dd7cd7d51bbd637cc46d8f104a141bc355ea (diff) | |
| download | ffmpeg-3e641b4842b8b5f6592991479d19f1a7ce846308.tar.gz | |
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg.texi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 1a2a801770..18a858baa4 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -631,6 +631,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 @@ -648,6 +651,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 |