diff options
| author | Peter Ross <pross@xvid.org> | 2012-12-09 22:42:54 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 17:15:46 +0100 |
| commit | 9282fbb9ad7e7012c9a7e1af71f157a610cca724 (patch) | |
| tree | 3c0958d8214a7af451f499c9a4fb1fd9e6b2db70 | |
| parent | 3193a5cdbf4dac52d80f6e0e1f5b40a1a61a129e (diff) | |
| download | ffmpeg-9282fbb9ad7e7012c9a7e1af71f157a610cca724.tar.gz | |
mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 6 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index bbf3381694..dde4253ece 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -469,6 +469,7 @@ enum AVCodecID { AV_CODEC_ID_XBIN = MKBETAG('X','B','I','N'), AV_CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'), AV_CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'), + AV_CODEC_ID_SMPTE_KLV = MKBETAG('K','L','V','A'), AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 5e4f357457..013752620e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2446,6 +2446,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("iCEDraw text"), .props = AV_CODEC_PROP_INTRA_ONLY, }, + { + .id = AV_CODEC_ID_SMPTE_KLV, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "klv", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE 336M Key-Length-Value (KLV) metadata"), + }, }; diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 788a59b316..86a4bb3825 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -581,6 +581,7 @@ static const StreamType REGD_types[] = { { MKTAG('D','T','S','1'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, { MKTAG('D','T','S','2'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, { MKTAG('D','T','S','3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, + { MKTAG('K','L','V','A'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_KLV }, { MKTAG('V','C','-','1'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, { 0 }, }; |