diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 01:06:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 01:22:22 +0200 |
| commit | c6eee3120a594cf25feb892f952a409a512d182e (patch) | |
| tree | dfadf4547a680823f6805011d1bcf6077a9ce121 /doc | |
| parent | 9c6eef6f5fcfaa67c0d9b01e44434e4c26538f96 (diff) | |
| parent | 35177ba77ff60a8b8839783f57e44bcc4214507a (diff) | |
| download | ffmpeg-c6eee3120a594cf25feb892f952a409a512d182e.tar.gz | |
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg.texi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 8d646f5286..05c7d974c3 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -645,6 +645,9 @@ Automatically select the hardware acceleration method. @item vdpau Use VDPAU (Video Decode and Presentation API for Unix) hardware acceleration. + +@item dxva2 +Use DXVA2 (DirectX Video Acceleration) hardware acceleration. @end table This option has no effect if the selected hwaccel is not available or not @@ -667,6 +670,10 @@ method chosen. @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 + +@item dxva2 +For DXVA2, this option should contain the number of the display adapter to use. +If this option is not specified, the default adapter is used. @end table @end table |