diff options
| author | Peter Ross <pross@xvid.org> | 2013-04-11 09:57:15 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-14 13:41:40 +0200 |
| commit | d891d354c551f8b645b115758596326bbe629096 (patch) | |
| tree | a0b8172d330a9ab4f33e499e5f53a87ec0c376ed | |
| parent | 59d3c24e28ba1f99be7c6e65fb90e25d20f70f14 (diff) | |
| download | ffmpeg-d891d354c551f8b645b115758596326bbe629096.tar.gz | |
mpegts: Enable muxing of SMPTE KLV metadata
Muxer code rebased/split out by: Jeff Blackburne <jblackburne@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpegtsenc.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 0ddae651de..d92fcb1d73 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -397,6 +397,16 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) *q++ = 'c'; } break; + case AVMEDIA_TYPE_DATA: + if (st->codec->codec_id == AV_CODEC_ID_SMPTE_KLV) { + *q++ = 0x05; /* MPEG-2 registration descriptor */ + *q++ = 4; + *q++ = 'K'; + *q++ = 'L'; + *q++ = 'V'; + *q++ = 'A'; + } + break; } val = 0xf000 | (q - desc_length_ptr - 2); @@ -977,8 +987,8 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, *q++ = len >> 8; *q++ = len; val = 0x80; - /* data alignment indicator is required for subtitle data */ - if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) + /* data alignment indicator is required for subtitle and data streams */ + if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codec->codec_type == AVMEDIA_TYPE_DATA) val |= 0x04; *q++ = val; *q++ = flags; |