diff options
| author | Hagen Schmidt | 2015-11-12 22:54:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2015-11-16 00:34:12 +0100 |
| commit | 7bf465abf3697dcddfb4021e6db9aeec1724f7ed (patch) | |
| tree | d8b414739aa5afeb07e8f814ae11cf4e48c0cef1 /libavformat/mpegtsenc.c | |
| parent | 1ef336e912a7a3a13a9933825a56c421f891e44b (diff) | |
mpegtsenc: add vc-1 support to MPEG-TS muxer (ticket 2141)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mpegtsenc.c')
| -rw-r--r-- | libavformat/mpegtsenc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 252f9c676b..468bad497f 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -297,6 +297,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) case AV_CODEC_ID_DIRAC: stream_type = STREAM_TYPE_VIDEO_DIRAC; break; + case AV_CODEC_ID_VC1: + stream_type = STREAM_TYPE_VIDEO_VC1; + break; case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP3: stream_type = STREAM_TYPE_AUDIO_MPEG1; @@ -551,6 +554,13 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) *q++ = 'r'; *q++ = 'a'; *q++ = 'c'; + } else if (stream_type == STREAM_TYPE_VIDEO_VC1) { + *q++ = 0x05; /*MPEG-2 registration descriptor*/ + *q++ = 4; + *q++ = 'V'; + *q++ = 'C'; + *q++ = '-'; + *q++ = '1'; } break; case AVMEDIA_TYPE_DATA: |