summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2016-06-24 00:58:17 +0300
committerMartin Storsjö <martin@martin.st>2016-07-27 10:19:40 +0300
commitc5d326f551b0312ff581bf1df35b21d956e01523 (patch)
tree4736c5943b53002f6b17687a4a562c3e881563b3 /doc
parent54a0a52be100d36291084f92b7d6aee1a4960acb (diff)
Add an OpenH264 decoder wrapper
This is cherrypicked from libav, from commits 82b7525173f20702a8cbc26ebedbf4b69b8fecec and d0b1e6049b06eeeeca146ece4d2f199c5dba1565. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi9
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 7823dc13cf..6b5975c6d4 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -103,12 +103,19 @@ enable it.
@section OpenH264
-FFmpeg can make use of the OpenH264 library for H.264 encoding.
+FFmpeg can make use of the OpenH264 library for H.264 encoding and decoding.
Go to @url{http://www.openh264.org/} and follow the instructions for
installing the library. Then pass @code{--enable-libopenh264} to configure to
enable it.
+For decoding, this library is much more limited than the built-in decoder
+in libavcodec; currently, this library lacks support for decoding B-frames
+and some other main/high profile features. (It currently only supports
+constrained baseline profile and CABAC.) Using it is mostly useful for
+testing and for taking advantage of Cisco's patent portfolio license
+(@url{http://www.openh264.org/BINARY_LICENSE.txt}).
+
@section x264
FFmpeg can make use of the x264 library for H.264 encoding.