From: Mickaël Raulet <mraulet@insa-rennes.fr>
Date: Fri, 11 Oct 2013 19:43:58 +0000 (+0200)
Subject: mpegts: Support HEVC demuxing
X-Git-Tag: v10_alpha1~386
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6a4701612514c97d22f7ffb37993539f7718352;p=platform%2Fupstream%2Flibav.git

mpegts: Support HEVC demuxing

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---

diff --git a/Changelog b/Changelog
index 07c510d..953cc4d 100644
--- a/Changelog
+++ b/Changelog
@@ -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 d623452..a6a4a0a 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 148e66e..a361cd1 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, \