summaryrefslogtreecommitdiff
path: root/tools/qt-faststart.c
diff options
context:
space:
mode:
authorFrank Barchard <fbarchard@google.com>2009-07-06 05:36:14 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-07-06 05:36:14 +0000
commit31457d7a2e2f42885143c0e757fb3e26fbe112bb (patch)
tree6154bea855f9a7802c44529b9dcf23966dc2de84 /tools/qt-faststart.c
parentd03936e5aae4e6bb53c380a1892f07b539b9f89a (diff)
Do not fail if 'uuid' atom is encountered before 'moov'.
Patch by Frank Barchard, fbarchard at google dot com. Originally committed as revision 19354 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tools/qt-faststart.c')
-rw-r--r--tools/qt-faststart.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c
index a256eb1856..ff86e56e20 100644
--- a/tools/qt-faststart.c
+++ b/tools/qt-faststart.c
@@ -1,5 +1,5 @@
/*
- * qt-faststart.c, v0.1
+ * qt-faststart.c, v0.2
* by Mike Melanson (melanson@pcisys.net)
* This file is placed in the public domain. Use the program however you
* see fit.
@@ -64,6 +64,7 @@
#define WIDE_ATOM QT_ATOM('w', 'i', 'd', 'e')
#define PICT_ATOM QT_ATOM('P', 'I', 'C', 'T')
#define FTYP_ATOM QT_ATOM('f', 't', 'y', 'p')
+#define UUID_ATOM QT_ATOM('u', 'u', 'i', 'd')
#define CMOV_ATOM QT_ATOM('c', 'm', 'o', 'v')
#define STCO_ATOM QT_ATOM('s', 't', 'c', 'o')
@@ -119,6 +120,7 @@ int main(int argc, char *argv[])
(atom_type != SKIP_ATOM) &&
(atom_type != WIDE_ATOM) &&
(atom_type != PICT_ATOM) &&
+ (atom_type != UUID_ATOM) &&
(atom_type != FTYP_ATOM)) {
printf ("encountered non-QT top-level atom (is this a Quicktime file?)\n");
break;