Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(578)

Unified Diff: source/libvpx/libmkv/EbmlIDs.h

Issue 13474006: libvpx: Pull from upstream (Closed) Base URL: https://src.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/config/win/x64/vp8_rtcd.h ('k') | source/libvpx/vp8/common/generic/systemdependent.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/libmkv/EbmlIDs.h
===================================================================
--- source/libvpx/libmkv/EbmlIDs.h (revision 191886)
+++ source/libvpx/libmkv/EbmlIDs.h (working copy)
@@ -67,10 +67,10 @@
BlockGroup = 0xA0,
Block = 0xA1,
/* BlockVirtual = 0xA2, */
-/* BlockAdditions = 0x75A1, */
-/* BlockMore = 0xA6, */
-/* BlockAddID = 0xEE, */
-/* BlockAdditional = 0xA5, */
+ BlockAdditions = 0x75A1,
+ BlockMore = 0xA6,
+ BlockAddID = 0xEE,
+ BlockAdditional = 0xA5,
BlockDuration = 0x9B,
/* ReferencePriority = 0xFA, */
ReferenceBlock = 0xFB,
@@ -100,7 +100,7 @@
DefaultDuration = 0x23E383,
/* TrackTimecodeScale = 0x23314F, */
/* TrackOffset = 0x537F, */
-/* MaxBlockAdditionID = 0x55EE, */
+ MaxBlockAdditionID = 0x55EE,
Name = 0x536E,
Language = 0x22B59C,
CodecID = 0x86,
@@ -120,6 +120,7 @@
Video = 0xE0,
FlagInterlaced = 0x9A,
StereoMode = 0x53B8,
+ AlphaMode = 0x53C0,
PixelWidth = 0xB0,
PixelHeight = 0xBA,
PixelCropBottom = 0x54AA,
« no previous file with comments | « source/config/win/x64/vp8_rtcd.h ('k') | source/libvpx/vp8/common/generic/systemdependent.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698