Commit 92457ada93 for ffmpeg
commit 92457ada93cf5d593d23cc18cd040a91532b6943
Author: Ruonan <yu_ruonan@outlook.com>
Date: Tue Oct 13 16:34:28 2026 +0800
avcodec/avs: disambiguate Creature Shock decoder name
The AVS decoder handles the video stream used by the Creature Shock
multimedia format, not the Chinese AVS codec. The current "Audio Video
Standard" expansion conflates the two.
Rename the decoder long name to "Argonaut Games Creature Shock video",
using the same identifying name as the existing demuxer while making
clear that this is the video decoder. Update the codec descriptor and
codec list as well.
No short codec names, codec IDs, or decoding behavior are changed.
Signed-off-by: Ruonan <yu_ruonan@outlook.com>
diff --git a/doc/general_contents.texi b/doc/general_contents.texi
index cfaf4252c6..778f433015 100644
--- a/doc/general_contents.texi
+++ b/doc/general_contents.texi
@@ -1011,6 +1011,8 @@ following image formats are supported:
@item Apple QuickDraw @tab @tab X
@tab fourcc: qdrw
@item APV @tab @tab X
+@item Argonaut Games Creature Shock video @tab @tab X
+ @tab Video encoding used by the Creature Shock game.
@item Argonaut Video @tab @tab X
@tab Used in some Argonaut games.
@item Asus v1 @tab X @tab X
@@ -1030,8 +1032,6 @@ following image formats are supported:
@tab Supported through external libraries libaom, libdav1d, librav1e and libsvtav1
@item Avid 1:1 10-bit RGB Packer @tab X @tab X
@tab fourcc: AVrp
-@item AVS (Audio Video Standard) video @tab @tab X
- @tab Video encoding used by the Creature Shock game.
@item AVS2-P2/IEEE1857.4 @tab E @tab E
@tab Supported through external libraries libxavs2 and libdavs2
@item AVS3-P2/IEEE1857.10 @tab @tab E
diff --git a/libavcodec/avs.c b/libavcodec/avs.c
index 42fc99cb56..3d0898f682 100644
--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@@ -179,7 +179,7 @@ static av_cold int avs_decode_end(AVCodecContext *avctx)
const FFCodec ff_avs_decoder = {
.p.name = "avs",
- CODEC_LONG_NAME("AVS (Audio Video Standard) video"),
+ CODEC_LONG_NAME("Argonaut Games Creature Shock video"),
.p.type = AVMEDIA_TYPE_VIDEO,
.p.id = AV_CODEC_ID_AVS,
.priv_data_size = sizeof(AvsContext),
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 70d8df71f0..cc0a88e5dd 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -623,7 +623,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id = AV_CODEC_ID_AVS,
.type = AVMEDIA_TYPE_VIDEO,
.name = "avs",
- .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"),
+ .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games Creature Shock video"),
.props = AV_CODEC_PROP_LOSSY,
},
{