Merge commit '1746dc382ddbf3f8a3f039815644f7eb9076110e'

[ffmpeg] / libavcodec / codec_desc.c

diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index b51d0e9a5bb7afa5844c27c5148847dd312d8aa8..c1694f3383a4f2422ff15c769c2e5cfb8b6ae583 100644 (file)
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1245,6 +1245,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("Canopus HQX"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
     },
+    {
+        .id        = AV_CODEC_ID_HQ_HQA,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "hq_hqa",
+        .long_name = NULL_IF_CONFIG_SMALL("Canopus HQ/HQA"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+    },
 
     /* image codecs */
     {