aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorCarlos Fernandez <carlos@ccextractor.org>2016-10-18 17:36:27 -0700
committerMarton Balint <cus@passwd.hu>2016-10-21 20:39:27 +0200
commitd53a120ad63faaa4e59a422af557c24c2bf9604f (patch)
tree6392e1d891218896035a38cf79ee896bacc30010 /libavcodec
parentdfc561a38e94b11bcc8e76f68f290fa85176f58b (diff)
downloadffmpeg-d53a120ad63faaa4e59a422af557c24c2bf9604f.tar.gz
lavc: add SCTE-35 CUI codec ID
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Carlos Fernandez <carlos@ccextractor.org> Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/codec_desc.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d72ee071bf..af550a86bf 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -631,6 +631,7 @@ enum AVCodecID {
AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
AV_CODEC_ID_TTF = 0x18000,
+ AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program stream.
AV_CODEC_ID_BINTEXT = 0x18800,
AV_CODEC_ID_XBIN,
AV_CODEC_ID_IDF,
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 24948caffe..2612215b66 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2964,6 +2964,12 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("binary data"),
.mime_types= MT("application/octet-stream"),
},
+ {
+ .id = AV_CODEC_ID_SCTE_35,
+ .type = AVMEDIA_TYPE_DATA,
+ .name = "scte_35",
+ .long_name = NULL_IF_CONFIG_SMALL("SCTE 35 Message Queue"),
+ },
/* deprecated codec ids */
};