Commit 633739c7 authored by bcoudurier's avatar bcoudurier

Do not fail if 'uuid' atom is encountered before 'moov'.

Patch by Frank Barchard, fbarchard at google dot com.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19354 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 513d7a99
/* /*
* qt-faststart.c, v0.1 * qt-faststart.c, v0.2
* by Mike Melanson (melanson@pcisys.net) * by Mike Melanson (melanson@pcisys.net)
* This file is placed in the public domain. Use the program however you * This file is placed in the public domain. Use the program however you
* see fit. * see fit.
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
#define WIDE_ATOM QT_ATOM('w', 'i', 'd', 'e') #define WIDE_ATOM QT_ATOM('w', 'i', 'd', 'e')
#define PICT_ATOM QT_ATOM('P', 'I', 'C', 'T') #define PICT_ATOM QT_ATOM('P', 'I', 'C', 'T')
#define FTYP_ATOM QT_ATOM('f', 't', 'y', 'p') #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 CMOV_ATOM QT_ATOM('c', 'm', 'o', 'v')
#define STCO_ATOM QT_ATOM('s', 't', 'c', 'o') #define STCO_ATOM QT_ATOM('s', 't', 'c', 'o')
...@@ -119,6 +120,7 @@ int main(int argc, char *argv[]) ...@@ -119,6 +120,7 @@ int main(int argc, char *argv[])
(atom_type != SKIP_ATOM) && (atom_type != SKIP_ATOM) &&
(atom_type != WIDE_ATOM) && (atom_type != WIDE_ATOM) &&
(atom_type != PICT_ATOM) && (atom_type != PICT_ATOM) &&
(atom_type != UUID_ATOM) &&
(atom_type != FTYP_ATOM)) { (atom_type != FTYP_ATOM)) {
printf ("encountered non-QT top-level atom (is this a Quicktime file?)\n"); printf ("encountered non-QT top-level atom (is this a Quicktime file?)\n");
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment