diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 12:44:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 13:56:52 +0200 |
| commit | 4c292d5c34c9636364bcfb5f2e950c48196d9e9e (patch) | |
| tree | 359af27bc9033b9a6419ea222a79d76fc8f1fad9 /doc | |
| parent | 5a63fb66936a2732b9d59edf3cebc4b6291f5d08 (diff) | |
| parent | f1548c008fc5d50488bb7bbc2aa4cf49d89a0bda (diff) | |
| download | ffmpeg-4c292d5c34c9636364bcfb5f2e950c48196d9e9e.tar.gz | |
Merge remote-tracking branch 'rbultje/master'
* rbultje/master:
Full-pixel MC functions.
VP9 MC (ssse3) optimizations.
Native VP9 decoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index f4776c8cb7..647c5e20ee 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -94,7 +94,7 @@ Then pass @code{--enable-libtwolame} to configure to enable it. @section libvpx -FFmpeg can make use of the libvpx library for VP8 encoding. +FFmpeg can make use of the libvpx library for VP8/VP9 encoding. Go to @url{http://www.webmproject.org/} and follow the instructions for installing the library. Then pass @code{--enable-libvpx} to configure to @@ -676,6 +676,8 @@ following image formats are supported: @tab fourcc: VP60,VP61,VP62 @item VP8 @tab E @tab X @tab fourcc: VP80, encoding supported through external library libvpx +@item VP9 @tab E @tab X + @tab encoding supported through external library libvpx @item Pinnacle TARGA CineWave YUV16 @tab @tab X @tab fourcc: Y216 @item Prores @tab @tab X |