diff options
| author | Can Wu <wu.canus@gmail.com> | 2013-02-26 10:01:21 +0800 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-15 09:33:24 +0100 |
| commit | 81cf53e13309bd58aeb10f3574807f66b25d0091 (patch) | |
| tree | eed71bfe4784eaaf461fa209cd4ce84bc649a5a2 | |
| parent | 3e175a2a550f5c2f788e8cd969052e10a5025a27 (diff) | |
| download | ffmpeg-81cf53e13309bd58aeb10f3574807f66b25d0091.tar.gz | |
mpegts: add support for stream_type 0x42, which is CAVS
This allows demuxing and muxing of CAVS TS streams.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavformat/mpeg.h | 1 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 1 | ||||
| -rw-r--r-- | libavformat/mpegts.h | 1 | ||||
| -rw-r--r-- | libavformat/mpegtsenc.c | 3 |
4 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index 75dddf346b..629f2f061d 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -54,6 +54,7 @@ #define STREAM_TYPE_AUDIO_AAC 0x0f #define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_H264 0x1b +#define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_AUDIO_AC3 0x81 #define STREAM_TYPE_AUDIO_DTS 0x8a diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 2582c5b0bd..1540a8d118 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -523,6 +523,7 @@ static const StreamType ISO_types[] = { { 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 }, { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM }, /* LATM syntax */ { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, + { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, { 0 }, diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 89544f06f8..fafe98fcf8 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -52,6 +52,7 @@ #define STREAM_TYPE_AUDIO_AAC_LATM 0x11 #define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_H264 0x1b +#define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_VIDEO_VC1 0xea #define STREAM_TYPE_VIDEO_DIRAC 0xd1 diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 29d83c668a..44a5e5b089 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -279,6 +279,9 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) case AV_CODEC_ID_H264: stream_type = STREAM_TYPE_VIDEO_H264; break; + case AV_CODEC_ID_CAVS: + stream_type = STREAM_TYPE_VIDEO_CAVS; + break; case AV_CODEC_ID_DIRAC: stream_type = STREAM_TYPE_VIDEO_DIRAC; break; |