generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "clang-format on mkvmuxertypes.hpp and webmids.hpp"

Browse Source
This commit is contained in:
Vignesh Venkatasubramanian
2014-04-28 10:40:43 -07:00
committed by Gerrit Code Review
parent 41f869cb0c 743725477c
commit eddf9744cb
2 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mkvmuxertypes.hpp
View File

@@ -25,6 +25,6 @@ typedef unsigned int uint32;
typedef long long int64; typedef long long int64;
typedef unsigned long long uint64; typedef unsigned long long uint64;
} //end namespace mkvmuxer } // end namespace mkvmuxer
#endif // MKVMUXERTYPES_HPP #endif // MKVMUXERTYPES_HPP

26
webmids.hpp
View File

@@ -29,21 +29,21 @@ enum MkvId {
kMkvSignatureElements = 0x7E5B, kMkvSignatureElements = 0x7E5B,
kMkvSignatureElementList = 0x7E7B, kMkvSignatureElementList = 0x7E7B,
kMkvSignedElement = 0x6532, kMkvSignedElement = 0x6532,
//segment // segment
kMkvSegment = 0x18538067, kMkvSegment = 0x18538067,
//Meta Seek Information // Meta Seek Information
kMkvSeekHead = 0x114D9B74, kMkvSeekHead = 0x114D9B74,
kMkvSeek = 0x4DBB, kMkvSeek = 0x4DBB,
kMkvSeekID = 0x53AB, kMkvSeekID = 0x53AB,
kMkvSeekPosition = 0x53AC, kMkvSeekPosition = 0x53AC,
//Segment Information // Segment Information
kMkvInfo = 0x1549A966, kMkvInfo = 0x1549A966,
kMkvTimecodeScale = 0x2AD7B1, kMkvTimecodeScale = 0x2AD7B1,
kMkvDuration = 0x4489, kMkvDuration = 0x4489,
kMkvDateUTC = 0x4461, kMkvDateUTC = 0x4461,
kMkvMuxingApp = 0x4D80, kMkvMuxingApp = 0x4D80,
kMkvWritingApp = 0x5741, kMkvWritingApp = 0x5741,
//Cluster // Cluster
kMkvCluster = 0x1F43B675, kMkvCluster = 0x1F43B675,
kMkvTimecode = 0xE7, kMkvTimecode = 0xE7,
kMkvPrevSize = 0xAB, kMkvPrevSize = 0xAB,
@@ -58,7 +58,7 @@ enum MkvId {
kMkvBlockAddID = 0xEE, kMkvBlockAddID = 0xEE,
kMkvBlockAdditional = 0xA5, kMkvBlockAdditional = 0xA5,
kMkvDiscardPadding = 0x75A2, kMkvDiscardPadding = 0x75A2,
//Track // Track
kMkvTracks = 0x1654AE6B, kMkvTracks = 0x1654AE6B,
kMkvTrackEntry = 0xAE, kMkvTrackEntry = 0xAE,
kMkvTrackNumber = 0xD7, kMkvTrackNumber = 0xD7,
@@ -77,7 +77,7 @@ enum MkvId {
kMkvCodecName = 0x258688, kMkvCodecName = 0x258688,
kMkvCodecDelay = 0x56AA, kMkvCodecDelay = 0x56AA,
kMkvSeekPreRoll = 0x56BB, kMkvSeekPreRoll = 0x56BB,
//video // video
kMkvVideo = 0xE0, kMkvVideo = 0xE0,
kMkvFlagInterlaced = 0x9A, kMkvFlagInterlaced = 0x9A,
kMkvStereoMode = 0x53B8, kMkvStereoMode = 0x53B8,
@@ -93,15 +93,15 @@ enum MkvId {
kMkvDisplayUnit = 0x54B2, kMkvDisplayUnit = 0x54B2,
kMkvAspectRatioType = 0x54B3, kMkvAspectRatioType = 0x54B3,
kMkvFrameRate = 0x2383E3, kMkvFrameRate = 0x2383E3,
//end video // end video
//audio // audio
kMkvAudio = 0xE1, kMkvAudio = 0xE1,
kMkvSamplingFrequency = 0xB5, kMkvSamplingFrequency = 0xB5,
kMkvOutputSamplingFrequency = 0x78B5, kMkvOutputSamplingFrequency = 0x78B5,
kMkvChannels = 0x9F, kMkvChannels = 0x9F,
kMkvBitDepth = 0x6264, kMkvBitDepth = 0x6264,
//end audio // end audio
//ContentEncodings // ContentEncodings
kMkvContentEncodings = 0x6D80, kMkvContentEncodings = 0x6D80,
kMkvContentEncoding = 0x6240, kMkvContentEncoding = 0x6240,
kMkvContentEncodingOrder = 0x5031, kMkvContentEncodingOrder = 0x5031,
@@ -113,8 +113,8 @@ enum MkvId {
kMkvContentEncAESSettings = 0x47E7, kMkvContentEncAESSettings = 0x47E7,
kMkvAESSettingsCipherMode = 0x47E8, kMkvAESSettingsCipherMode = 0x47E8,
kMkvAESSettingsCipherInitData = 0x47E9, kMkvAESSettingsCipherInitData = 0x47E9,
//end ContentEncodings // end ContentEncodings
//Cueing Data // Cueing Data
kMkvCues = 0x1C53BB6B, kMkvCues = 0x1C53BB6B,
kMkvCuePoint = 0xBB, kMkvCuePoint = 0xBB,
kMkvCueTime = 0xB3, kMkvCueTime = 0xB3,
@@ -122,7 +122,7 @@ enum MkvId {
kMkvCueTrack = 0xF7, kMkvCueTrack = 0xF7,
kMkvCueClusterPosition = 0xF1, kMkvCueClusterPosition = 0xF1,
kMkvCueBlockNumber = 0x5378, kMkvCueBlockNumber = 0x5378,
//Chapters // Chapters
kMkvChapters = 0x1043A770, kMkvChapters = 0x1043A770,
kMkvEditionEntry = 0x45B9, kMkvEditionEntry = 0x45B9,
kMkvChapterAtom = 0xB6, kMkvChapterAtom = 0xB6,