avs2: correct avs2 description

Signed-off-by: hwren <hwrenx@126.com>
Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>

diff --git a/doc/decoders.texi b/doc/decoders.texi
index 9439b7b96a65dd58dae6acecded5c09e73e3aa14..31e96fbc8def95025ade925d3d614b22c369c547 100644 (file)
--- 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 cd725bb51d0432b4c7596c57735f71ee7f4d496e..3d1584097e2f098c93346f511ed32741491537eb 100644 (file)
--- 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 520e98a9b4048c3476e681c20c5c252d122bcb7d..1c9b3423ffa99b9839722e2b6d857ad3fb8c271b 100644 (file)
--- 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 2fe4aaaa7b55f9b25e87a64fe5748d5201cc2a7d..1cbb2413894f2d9e3bdef8e50168726d0ab37844 100644 (file)
--- 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 12db1f9da74980dad0a603531ea13977c5699cd0..70aae3e5eb02884df732c58e34bdf0a5cd638ca9 100644 (file)
--- 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),