diff options
| author | Mickaël Raulet <mraulet@insa-rennes.fr> | 2013-10-11 21:43:58 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-31 20:20:57 +0100 |
| commit | b6a4701612514c97d22f7ffb37993539f7718352 (patch) | |
| tree | 5d851654e47364aecf71904886722f5bd1fcefc6 | |
| parent | 959bea13ce3498a5bddf8a415a061a7bb5a8b075 (diff) | |
mpegts: Support HEVC demuxing
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 1 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -42,7 +42,7 @@ version 10: - F4V muxer - HNM version 4 demuxer and video decoder - HEVC decoder -- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing +- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing version 9: diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d623452130..a6a4a0a6fe 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -537,6 +537,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 }, + { 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 }, diff --git a/libavformat/version.h b/libavformat/version.h index 148e66e7d3..a361cd1362 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 9 -#define LIBAVFORMAT_VERSION_MICRO 2 +#define LIBAVFORMAT_VERSION_MICRO 3 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |