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

Unified Diff: media/formats/mp4/fourccs.h

Issue 1998333002: MP4 support for Common Encryption 'cbcs' scheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix a problem in hasty change before upload Created 4 years, 7 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
Index: media/formats/mp4/fourccs.h
diff --git a/media/formats/mp4/fourccs.h b/media/formats/mp4/fourccs.h
index 3518f73a145435a3b25a8d9905de51740d03e69a..c76cbede0761290eb5f17ed2e6a5033022dda9f6 100644
--- a/media/formats/mp4/fourccs.h
+++ b/media/formats/mp4/fourccs.h
@@ -22,7 +22,10 @@ enum FourCC {
FOURCC_AVC3 = 0x61766333,
FOURCC_AVCC = 0x61766343,
FOURCC_BLOC = 0x626C6F63,
+ FOURCC_CBC1 = 0x63626331,
+ FOURCC_CBCS = 0x63626373,
FOURCC_CENC = 0x63656e63,
+ FOURCC_CENS = 0x63656e73,
FOURCC_CO64 = 0x636f3634,
FOURCC_CTTS = 0x63747473,
FOURCC_DINF = 0x64696e66,

Powered by Google App Engine
This is Rietveld 408576698