aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorolugbone <olugbone@gmail.com>2014-03-03 19:32:41 +0000
committerMichael Niedermayer <michaelni@gmx.at>2014-03-04 15:44:04 +0100
commitb2880a3de9e3e160c47c069abcc8cb60015407b6 (patch)
treecc98ca49d4073bfb252ff30158d73e4bb47d1217 /libavformat
parentefc4439c894be9f45ec472ad2471143f94abc399 (diff)
downloadffmpeg-b2880a3de9e3e160c47c069abcc8cb60015407b6.tar.gz
avformat/mpegtsenc: fix HEVC MPEG TS stream type
Allowing HEVC video using TS stream type 0x24 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpegts.h1
-rw-r--r--libavformat/mpegtsenc.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 269c23b925..4d702a2cae 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_HEVC 0x24 //Definition of 0x24 HEVC video MPEG TS stream type
#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 6f075c5c4b..09d1b9e6c6 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -292,6 +292,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
case AV_CODEC_ID_H264:
stream_type = STREAM_TYPE_VIDEO_H264;
break;
+ case AV_CODEC_ID_HEVC:
+ stream_type = STREAM_TYPE_VIDEO_HEVC;
+ break;
case AV_CODEC_ID_CAVS:
stream_type = STREAM_TYPE_VIDEO_CAVS;
break;