diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 02:34:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 02:44:28 +0200 |
| commit | 5460ab73d2e8169c54beda06e7cca762aee84a1f (patch) | |
| tree | 8c50adb34c4df34a90cba7bc14edc84fe8bd4f13 /doc | |
| parent | 2856332719d8ec182523f7793bb0517aaac68e73 (diff) | |
| parent | 1839fafa951308237c4672ffd9a94f927b26eac7 (diff) | |
Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
avconv: Support VDA hwaccel
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 05c7d974c3..765b2a7ebc 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -643,6 +643,9 @@ Do not use any hardware acceleration (the default). @item auto Automatically select the hardware acceleration method. +@item vda +Use Apple VDA hardware acceleration. + @item vdpau Use VDPAU (Video Decode and Presentation API for Unix) hardware acceleration. |