Merge commit '2601a944'

* commit '2601a944': mpegts: Add HEVC definitions Conflicts: libavformat/mpegts.h See: b2880a3dMerged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '2601a944'
* commit '2601a944': mpegts: Add HEVC definitions Conflicts: libavformat/mpegts.h See: b2880a3dMerged-by: Michael Niedermayer <michaelni@gmx.at>
2e2e6b1b · Michael Niedermayer · 94d4f9d4 · 2601a944 · 2e2e6b1b
Commit 2e2e6b1b authored Aug 05, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mpegts.h libavformat/mpegts.h +1 -1

No files found.
--- 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