aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhwren <hwrenx@126.com>2018-08-07 18:39:34 +0800
committerGyan Doshi <ffmpeg@gyani.pro>2018-08-08 00:13:13 +0530
commitf563e7868fb9540e1c8a589558fba2beaaba01e0 (patch)
treeeb8492d3b55e19be0d36a5a5c4e1b88a95813923
parent81f25a105136bc404df63bf8386e90492ef84944 (diff)
downloadffmpeg-f563e7868fb9540e1c8a589558fba2beaaba01e0.tar.gz
avs2: correct avs2 description
Signed-off-by: hwren <hwrenx@126.com> Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
-rw-r--r--doc/decoders.texi2
-rw-r--r--doc/general.texi2
-rw-r--r--libavcodec/avs2_parser.c2
-rw-r--r--libavcodec/codec_desc.c2
-rw-r--r--libavcodec/libdavs2.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/decoders.texi b/doc/decoders.texi
index 9439b7b96a..31e96fbc8d 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -49,7 +49,7 @@ top-field-first is assumed
@section libdavs2
-AVS2/IEEE 1857.4 video decoder wrapper.
+AVS2-P2/IEEE1857.4 video decoder wrapper.
This decoder allows libavcodec to decode AVS2 streams with davs2 library.
diff --git a/doc/general.texi b/doc/general.texi
index cd725bb51d..3d1584097e 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -19,7 +19,7 @@ explicitly requested by passing the appropriate flags to
@section libdavs2
-FFmpeg can make use of the davs2 library for AVS2/IEEE 1857.4 video decoding.
+FFmpeg can make use of the davs2 library for AVS2-P2/IEEE1857.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
diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c
index 520e98a9b4..1c9b3423ff 100644
--- a/libavcodec/avs2_parser.c
+++ b/libavcodec/avs2_parser.c
@@ -1,5 +1,5 @@
/*
- * AVS2/IEEE 1857.4 video parser.
+ * AVS2-P2/IEEE1857.4 video parser.
* Copyright (c) 2018 Huiwen Ren <hwrenx@gmail.com>
*
* This file is part of FFmpeg.
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 2fe4aaaa7b..1cbb241389 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1398,7 +1398,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_AVS2,
.type = AVMEDIA_TYPE_VIDEO,
.name = "avs2",
- .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"),
+ .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"),
.props = AV_CODEC_PROP_LOSSY,
},
{
diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
index 12db1f9da7..70aae3e5eb 100644
--- a/libavcodec/libdavs2.c
+++ b/libavcodec/libdavs2.c
@@ -163,7 +163,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data,
AVCodec ff_libdavs2_decoder = {
.name = "libdavs2",
- .long_name = NULL_IF_CONFIG_SMALL("Decoder for AVS2/IEEE 1857.4"),
+ .long_name = NULL_IF_CONFIG_SMALL("libdavs2 AVS2-P2/IEEE1857.4"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_AVS2,
.priv_data_size = sizeof(DAVS2Context),