diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-15 13:28:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-15 13:28:38 +0100 |
| commit | 231795270b67496e01ad87731e0e95853146f038 (patch) | |
| tree | faa735beb3fe1e0c3c05de3881222c86d72e4839 /libavformat | |
| parent | 9df00574fca16b3c8aa9892f9a3ed5bd6482833a (diff) | |
| parent | b164d66e35d349de414e2f0d7365a147aba8a620 (diff) | |
| download | ffmpeg-231795270b67496e01ad87731e0e95853146f038.tar.gz | |
Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'
* commit 'b164d66e35d349de414e2f0d7365a147aba8a620':
ape: make version-dependent decoding functions called via pointers
mpegts: add support for stream_type 0x42, which is CAVS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 ca019c9eb2..a1e89806ff 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 d413d54fd6..85b5146255 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -566,6 +566,7 @@ static const StreamType ISO_types[] = { { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM }, /* LATM syntax */ #endif { 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 98c4b93736..269c23b925 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 56b9d8506a..7016774c49 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -288,6 +288,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; |