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/mpegts.c | |
| 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/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 }, |