summaryrefslogtreecommitdiff
path: root/libavcodec/codec_desc.c
diff options
context:
space:
mode:
authorEejya Singh <singh.eejya@gmail.com>2014-10-21 01:55:39 +0530
committerClément Bœsch <u@pkh.me>2014-10-22 23:12:38 +0200
commit6dc99fdf0e4328ca2992b7bfcd139f7b1b636bf8 (patch)
tree85e41b861fcb0fb4b0b32411fe383e99173c7326 /libavcodec/codec_desc.c
parent27c61c32cee4d4944da15226b56901926136214f (diff)
Added STL demuxer and decoder
Signed-off-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/codec_desc.c')
-rw-r--r--libavcodec/codec_desc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 9e9728b7bc..eeb45054c5 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2635,6 +2635,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.props = AV_CODEC_PROP_TEXT_SUB,
},
{
+ .id = AV_CODEC_ID_STL,
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .name = "stl",
+ .long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"),
+ .props = AV_CODEC_PROP_TEXT_SUB,
+ },
+ {
.id = AV_CODEC_ID_SUBVIEWER1,
.type = AVMEDIA_TYPE_SUBTITLE,
.name = "subviewer1",