diff options
| author | Mickaël Raulet <mraulet@insa-rennes.fr> | 2013-10-11 21:43:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-15 23:48:00 +0200 |
| commit | 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0 (patch) | |
| tree | e3ad685f749fcfd9c528dde159ceeb800ce8aa60 /libavformat/mpegts.c | |
| parent | f2dd45d06c606c41bcbf227ffc47e1ac0ce37d65 (diff) | |
| download | ffmpeg-93c1fe4de3937df63c3d68e87dd7d2fabd5203c0.tar.gz | |
hevc: add ts demux support
cherry picked from commit 925ee44364a7bce58e2ac5bac91077ce0a75d883
Signed-off-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 cd881d8130..e455aec1a5 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -599,6 +599,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 }, + { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, |