[FFmpeg-cvslog] mpegtsenc: add vc-1 support to MPEG-TS muxer (ticket 2141)
Hagen Schmidt
git at videolan.org
Mon Nov 16 00:51:03 CET 2015
ffmpeg | branch: master | Hagen Schmidt <schmidthagen at gmail.com> | Thu Nov 12 22:54:18 2015 +0100| [7bf465abf3697dcddfb4021e6db9aeec1724f7ed] | committer: Michael Niedermayer
mpegtsenc: add vc-1 support to MPEG-TS muxer (ticket 2141)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bf465abf3697dcddfb4021e6db9aeec1724f7ed
---
libavformat/mpegtsenc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 252f9c6..468bad4 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:
More information about the ffmpeg-cvslog
mailing list