Merge commit '3b8e895237592fdaffe87cdcd204104200b9ccf9'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 9 Sep 2015 07:55:14 +0000 (09:55 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 9 Sep 2015 07:55:14 +0000 (09:55 +0200)
* commit '3b8e895237592fdaffe87cdcd204104200b9ccf9':
  codec_desc: Add missing DXV entry

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/codec_desc.c

index 632748e..e2f5176 100644 (file)
@@ -1259,6 +1259,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap decoder"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
     },
+    {
+        .id        = AV_CODEC_ID_DXV,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "dxv",
+        .long_name = NULL_IF_CONFIG_SMALL("Resolume DXV"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+    },
 
     /* image codecs */
     {