---
libavcodec/avcodec.h | 1 +
libavcodec/codec_desc.c | 7 +++++++
libavformat/mpegts.c | 1 +
3 files changed, 9 insertions(+)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 12a6b54..b4cf79d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -516,6 +516,7 @@ enum AVCodecID {
AV_CODEC_ID_HDMV_PGS_SUBTITLE,
AV_CODEC_ID_DVB_TELETEXT,
AV_CODEC_ID_SRT,
+ AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
AV_CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'),
AV_CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'),
AV_CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'),
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index c172bf8..487bc2f 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2735,6 +2735,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"),
.props = AV_CODEC_PROP_TEXT_SUB,
},
+ {
+ .id = AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .name = "hdmv_text_subtitle",
+ .long_name = NULL_IF_CONFIG_SMALL("HDMV Text subtitle"),
+ .props = AV_CODEC_PROP_TEXT_SUB,
+ },
/* other kind of codecs and pseudo-codecs */
{
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 625d473..bc5c4fe 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -718,6 +718,7 @@ static const StreamType HDMV_types[] = {
{ 0xa1, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 }, /* E-AC3
Secondary Audio */
{ 0xa2, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, /* DTS
Express Secondary Audio */
{ 0x90, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_HDMV_PGS_SUBTITLE },
+ { 0x92, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_HDMV_TEXT_SUBTITLE },
{ 0 },
};
--
2.1.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
