Mercurial > libavformat.hg
comparison mov.c @ 489:aeb69a5f3756 libavformat
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
| author | michael |
|---|---|
| date | Wed, 30 Jun 2004 19:24:43 +0000 |
| parents | b3fdae08c556 |
| children | 4cf46e9a1bb8 |
comparison
equal
deleted
inserted
replaced
| 488:e25b5ad6603e | 489:aeb69a5f3756 |
|---|---|
| 488 } else | 488 } else |
| 489 #endif | 489 #endif |
| 490 url_fskip(pb, len); | 490 url_fskip(pb, len); |
| 491 } | 491 } |
| 492 | 492 |
| 493 url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset)); | |
| 493 return 0; | 494 return 0; |
| 494 } | 495 } |
| 495 | 496 |
| 496 static int mov_mp4_read_descr_len(ByteIOContext *pb) | 497 static int mov_mp4_read_descr_len(ByteIOContext *pb) |
| 497 { | 498 { |
| 1442 { MKTAG( 'm', 'p', 'o', 'd' ), mov_read_leaf }, | 1443 { MKTAG( 'm', 'p', 'o', 'd' ), mov_read_leaf }, |
| 1443 { MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd }, | 1444 { MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd }, |
| 1444 { MKTAG( 'n', 'm', 'h', 'd' ), mov_read_leaf }, | 1445 { MKTAG( 'n', 'm', 'h', 'd' ), mov_read_leaf }, |
| 1445 { MKTAG( 'o', 'd', 'h', 'd' ), mov_read_default }, | 1446 { MKTAG( 'o', 'd', 'h', 'd' ), mov_read_default }, |
| 1446 { MKTAG( 's', 'd', 'h', 'd' ), mov_read_default }, | 1447 { MKTAG( 's', 'd', 'h', 'd' ), mov_read_default }, |
| 1447 { MKTAG( 's', 'k', 'i', 'p' ), mov_read_default }, | 1448 { MKTAG( 's', 'k', 'i', 'p' ), mov_read_leaf }, |
| 1448 { MKTAG( 's', 'm', 'h', 'd' ), mov_read_leaf }, /* sound media info header */ | 1449 { MKTAG( 's', 'm', 'h', 'd' ), mov_read_leaf }, /* sound media info header */ |
| 1449 { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorrenson extension ??? */ | 1450 { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorrenson extension ??? */ |
| 1450 { MKTAG( 's', 't', 'b', 'l' ), mov_read_default }, | 1451 { MKTAG( 's', 't', 'b', 'l' ), mov_read_default }, |
| 1451 { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco }, | 1452 { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco }, |
| 1452 { MKTAG( 's', 't', 'd', 'p' ), mov_read_default }, | 1453 { MKTAG( 's', 't', 'd', 'p' ), mov_read_default }, |