summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorhwren <hwrenx@126.com>2018-07-27 11:50:19 +0800
committerSteven Liu <lq@chinaffmpeg.org>2018-07-27 20:07:56 +0800
commit5985a1bf72332e10d251ec643e100b5592285819 (patch)
treec3eff73a3a1c13d00e2199900d7b9f415c8e57ec /doc
parentb7b7b8e8a1ab02c09093a5bb9ff4cd207ef2b77f (diff)
downloadffmpeg-5985a1bf72332e10d251ec643e100b5592285819.tar.gz
lavc, doc, configure: add avs2 video decoder wrapper
Tested-by: Steven Liu <lq@chinaffmpeg.org> Signed-off-by: hwren <hwrenx@126.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/decoders.texi6
-rw-r--r--doc/general.texi14
2 files changed, 20 insertions, 0 deletions
diff --git a/doc/decoders.texi b/doc/decoders.texi
index 8f07bc1afb..9439b7b96a 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -47,6 +47,12 @@ top-field-first is assumed
@end table
+@section libdavs2
+
+AVS2/IEEE 1857.4 video decoder wrapper.
+
+This decoder allows libavcodec to decode AVS2 streams with davs2 library.
+
@c man end VIDEO DECODERS
@chapter Audio Decoders
diff --git a/doc/general.texi b/doc/general.texi
index 8c3a04b078..cd725bb51d 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -17,6 +17,20 @@ for more formats. None of them are used by default, their use has to be
explicitly requested by passing the appropriate flags to
@command{./configure}.
+@section libdavs2
+
+FFmpeg can make use of the davs2 library for AVS2/IEEE 1857.4 video decoding.
+
+Go to @url{https://github.com/pkuvcl/davs2} and follow the instructions for
+installing the library. Then pass @code{--enable-libdavs2} to configure to
+enable it.
+
+@float NOTE
+libdavs2 is under the GNU Public License Version 2 or later
+(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for
+details), you must upgrade FFmpeg's license to GPL in order to use it.
+@end float
+
@section Alliance for Open Media libaom
FFmpeg can make use of the libaom library for AV1 decoding.