diff options
| author | Cedric Vincent <c-vinc02@bat710.univ-lyon1.fr> | 2004-06-30 19:24:43 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-06-30 19:24:43 +0000 |
| commit | 3c13647a8a0337a84ad3639ea0d727ed2b7f09d9 (patch) | |
| tree | 96a32b8727ea0a76aee16a3d9104f4548fa30711 /libavformat/mov.c | |
| parent | ff4905a5243f4e3faa7eeb8bfbfdccd04ac1bf7c (diff) | |
The atom 'skip' should be handled by 'mov_read_leaf()', not by
'mov_read_default()'. This atom has the same behaviour than the atom 'free'.
patch by (Cedric VINCENT <c-vinc02 at bat710 dot univ-lyon1 dot fr>)
the second part of the patch hasnt been applied, but fixed slightly differently
Originally committed as revision 3276 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index c074178d6b..dcebda0945 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -490,6 +490,7 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) url_fskip(pb, len); } + url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset)); return 0; } @@ -1444,7 +1445,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG( 'n', 'm', 'h', 'd' ), mov_read_leaf }, { MKTAG( 'o', 'd', 'h', 'd' ), mov_read_default }, { MKTAG( 's', 'd', 'h', 'd' ), mov_read_default }, -{ MKTAG( 's', 'k', 'i', 'p' ), mov_read_default }, +{ MKTAG( 's', 'k', 'i', 'p' ), mov_read_leaf }, { MKTAG( 's', 'm', 'h', 'd' ), mov_read_leaf }, /* sound media info header */ { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorrenson extension ??? */ { MKTAG( 's', 't', 'b', 'l' ), mov_read_default }, |