aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2018-09-26 22:39:18 +0200
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2018-09-27 23:53:21 +0200
commit303439bc5f7ac6bbadc20d7ec2d7ee4fec656ead (patch)
treefc396c5187baaa5dd46f51df58f7e788177a8729
parent476a77128a2557a619afeaf80a58c01eca1f9587 (diff)
downloadffmpeg-303439bc5f7ac6bbadc20d7ec2d7ee4fec656ead.tar.gz
lavf/mpeg: Support demuxing HEVC in mpeg-ps.
-rw-r--r--libavformat/mpeg.c3
-rw-r--r--libavformat/mpeg.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 159ea41bec..d4369b49c2 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -544,6 +544,9 @@ redo:
} else if (es_type == STREAM_TYPE_VIDEO_H264) {
codec_id = AV_CODEC_ID_H264;
type = AVMEDIA_TYPE_VIDEO;
+ } else if (es_type == STREAM_TYPE_VIDEO_HEVC) {
+ codec_id = AV_CODEC_ID_HEVC;
+ type = AVMEDIA_TYPE_VIDEO;
} else if (es_type == STREAM_TYPE_AUDIO_AC3) {
codec_id = AV_CODEC_ID_AC3;
type = AVMEDIA_TYPE_AUDIO;
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h
index 617e36cba8..b635295776 100644
--- a/libavformat/mpeg.h
+++ b/libavformat/mpeg.h
@@ -55,6 +55,7 @@
#define STREAM_TYPE_AUDIO_AAC 0x0f
#define STREAM_TYPE_VIDEO_MPEG4 0x10
#define STREAM_TYPE_VIDEO_H264 0x1b
+#define STREAM_TYPE_VIDEO_HEVC 0x24
#define STREAM_TYPE_VIDEO_CAVS 0x42
#define STREAM_TYPE_AUDIO_AC3 0x81