[FFmpeg-cvslog] lavf/mpeg: Support demuxing HEVC in mpeg-ps.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Wed Sep 26 22:39:18 2018 +0200| [303439bc5f7ac6bbadc20d7ec2d7ee4fec656ead] | committer: Carl Eugen Hoyos

lavf/mpeg: Support demuxing HEVC in mpeg-ps.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=303439bc5f7ac6bbadc20d7ec2d7ee4fec656ead
---

 libavformat/mpeg.c | 3 +++
 libavformat/mpeg.h | 1 +
 2 files changed, 4 insertions(+)

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