summaryrefslogtreecommitdiffstats
path: root/media/mp4/box_reader.cc
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 22:00:14 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 22:00:14 +0000
commit17f9b7fa39a7795e1698779c7ca507ebafea7bb4 (patch)
treea21ebc054bf136ff3c73edeebb94b4077703cb38 /media/mp4/box_reader.cc
parent4dd9f818b12f13ef8686388b836ecdb440438cc2 (diff)
downloadchromium_src-17f9b7fa39a7795e1698779c7ca507ebafea7bb4.zip
chromium_src-17f9b7fa39a7795e1698779c7ca507ebafea7bb4.tar.gz
chromium_src-17f9b7fa39a7795e1698779c7ca507ebafea7bb4.tar.bz2
Add missing top-level 'bloc' box 4cc & skip logic.
The 'bloc' box can appear in encrypted files and was accidentally left out of the initial implementation. The box can be safely ignored. Review URL: https://chromiumcodereview.appspot.com/13945010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4/box_reader.cc')
-rw-r--r--media/mp4/box_reader.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/mp4/box_reader.cc b/media/mp4/box_reader.cc
index 71d93a0..c788772 100644
--- a/media/mp4/box_reader.cc
+++ b/media/mp4/box_reader.cc
@@ -142,6 +142,7 @@ bool BoxReader::IsValidTopLevelBox(const FourCC& type,
switch (type) {
case FOURCC_FTYP:
case FOURCC_PDIN:
+ case FOURCC_BLOC:
case FOURCC_MOOV:
case FOURCC_MOOF:
case FOURCC_MFRA: