diff options
| author | Marton Balint <cus@passwd.hu> | 2018-05-19 11:06:23 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2018-06-08 23:21:18 +0200 |
| commit | d070d6f69df7075b0e5025c27cf96a9b1b10acba (patch) | |
| tree | 2de7e0efcc50f7bed1e3dd9f52b44891a97e63d0 /libavcodec | |
| parent | d48fb904fa8189abef3108ddc36e575e805ee47e (diff) | |
| download | ffmpeg-d070d6f69df7075b0e5025c27cf96a9b1b10acba.tar.gz | |
avcodec/avcodec.h: add AV_CODEC_ID_TTML
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 8 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fb0c6fae70..c90166deb6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -665,6 +665,7 @@ enum AVCodecID { AV_CODEC_ID_PJS, AV_CODEC_ID_ASS, AV_CODEC_ID_HDMV_TEXT_SUBTITLE, + AV_CODEC_ID_TTML, /* other specific kind of codecs (generally used for attachments) */ AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. 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 */ { diff --git a/libavcodec/version.h b/libavcodec/version.h index 5a70093eaa..b9752ce62c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 19 -#define LIBAVCODEC_VERSION_MICRO 105 +#define LIBAVCODEC_VERSION_MINOR 20 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |