aboutsummaryrefslogtreecommitdiff
path: root/libavformat/mpegts.h
diff options
context:
space:
mode:
authorMichael Niedermayer2014-08-05 13:52:32 +0200
committerMichael Niedermayer2014-08-05 13:52:32 +0200
commit2e2e6b1be5913f64830cae1538696601c61c80d0 (patch)
treea19f628dd687ca7e74d01b8d4805e8af4350f164 /libavformat/mpegts.h
parent94d4f9d405074572dc7d4ab40fe32a7e83040dc8 (diff)
parent2601a9447efb778930b01ac58d2cc1d02498db4e (diff)
Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'
* commit '2601a9447efb778930b01ac58d2cc1d02498db4e': mpegts: Add HEVC definitions Conflicts: libavformat/mpegts.h See: b2880a3de9e3e160c47c069abcc8cb60015407b6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.h')
-rw-r--r--libavformat/mpegts.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 7dfe844bdb..50a02590fa 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -52,7 +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_HEVC 0x24
#define STREAM_TYPE_VIDEO_CAVS 0x42
#define STREAM_TYPE_VIDEO_VC1 0xea
#define STREAM_TYPE_VIDEO_DIRAC 0xd1