Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2018-05-19 12:06:23 +0300
committerMarton Balint <cus@passwd.hu>2018-06-09 00:21:18 +0300
commitd070d6f69df7075b0e5025c27cf96a9b1b10acba (patch)
tree2de7e0efcc50f7bed1e3dd9f52b44891a97e63d0 /libavcodec/codec_desc.c
parentd48fb904fa8189abef3108ddc36e575e805ee47e (diff)
avcodec/avcodec.h: add AV_CODEC_ID_TTML
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec/codec_desc.c')
-rw-r--r--libavcodec/codec_desc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 79552a910d..36e9a9bbc7 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -3047,6 +3047,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("HDMV Text subtitle"),
.props = AV_CODEC_PROP_TEXT_SUB,
},
+ {
+ .id = AV_CODEC_ID_TTML,
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .name = "ttml",
+ .long_name = NULL_IF_CONFIG_SMALL("Timed Text Markup Language"),
+ .props = AV_CODEC_PROP_TEXT_SUB,
+ },
+
/* other kind of codecs and pseudo-codecs */
{