diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 17:24:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 17:24:23 +0200 |
| commit | 28f7b81f9b00ff7e7096e6d2415ddfd118c7b6e8 (patch) | |
| tree | 8e1ea78831ffd578d0a49a1cd5f9f9cb8dbd03f0 | |
| parent | e692c9672b28230419c912f90f4f3852cdd71dd0 (diff) | |
| parent | 26b0d7198e23ca6d0538ad7da1c383a146a4bf1a (diff) | |
| download | ffmpeg-28f7b81f9b00ff7e7096e6d2415ddfd118c7b6e8.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Read mov files where the moov atom is hidden within a free atom.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/isom.h | 1 | ||||
| -rw-r--r-- | libavformat/mov.c | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index a5934af4b9..253451ef38 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -169,6 +169,7 @@ typedef struct MOVContext { int64_t next_root_atom; ///< offset of the next root atom int *bitrates; ///< bitrates read before streams creation int bitrates_count; + int moov_retry; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index befbfa6e0a..fe089cdc5c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3120,6 +3120,19 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (atom.size >= 8) { a.size = avio_rb32(pb); a.type = avio_rl32(pb); + if (a.type == MKTAG('f','r','e','e') && + a.size >= 8 && + c->moov_retry) { + uint8_t buf[8]; + uint32_t *type = (uint32_t *)buf + 1; + avio_read(pb, buf, 8); + avio_seek(pb, -8, SEEK_CUR); + if (*type == MKTAG('m','v','h','d') || + *type == MKTAG('c','m','o','v')) { + av_log(c->fc, AV_LOG_ERROR, "Detected moov in a free atom.\n"); + a.type = MKTAG('m','o','o','v'); + } + } if (atom.type != MKTAG('r','o','o','t') && atom.type != MKTAG('m','o','o','v')) { @@ -3486,11 +3499,15 @@ static int mov_read_header(AVFormatContext *s) atom.size = INT64_MAX; /* check MOV header */ + do { + if (mov->moov_retry) + avio_seek(pb, 0, SEEK_SET); if ((err = mov_read_default(mov, pb, atom)) < 0) { av_log(s, AV_LOG_ERROR, "error reading header: %d\n", err); mov_read_close(s); return err; } + } while (pb->seekable && !mov->found_moov && !mov->moov_retry++); if (!mov->found_moov) { av_log(s, AV_LOG_ERROR, "moov atom not found\n"); mov_read_close(s); |