Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'

* commit '2601a9447efb778930b01ac58d2cc1d02498db4e': mpegts: Add HEVC definitions Conflicts: libavformat/mpegts.h See: b2880a3de9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 2e2e6b1be5
parent 94d4f9d405 2601a9447e
commit 2e2e6b1be5
1 changed files with 1 additions and 1 deletions
--- 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