Unified · Split
| @@ -7691,9 +7691,6 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 7690 unmodified lines | |||
| 7691 | atom.size = INT64_MAX; | 7691 | atom.size = INT64_MAX; |
| 7692 | while (total_size <= atom.size - 8 && !avio_feof(pb)) { | 7692 | while (total_size <= atom.size - 8 && !avio_feof(pb)) { |
| 7693 | int (*parse)(MOVContext*, AVIOContext*, MOVAtom) = NULL; | 7693 | int (*parse)(MOVContext*, AVIOContext*, MOVAtom) = NULL; |
| 7694 | a.size = atom.size; | ||
| 7695 | a.type=0; | ||
| 7696 | if (atom.size >= 8) { | ||
| 7697 | a.size = avio_rb32(pb); | 7694 | a.size = avio_rb32(pb); |
| 7698 | a.type = avio_rl32(pb); | 7695 | a.type = avio_rl32(pb); |
| 7699 | if (((a.type == MKTAG('f','r','e','e') && c->moov_retry) || | 7696 | if (((a.type == MKTAG('f','r','e','e') && c->moov_retry) || |
| @@ -7727,7 +7724,6 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 27 unmodified lines | |||
| 7727 | a.size = avio_rb64(pb) - 8; | 7724 | a.size = avio_rb64(pb) - 8; |
| 7728 | total_size += 8; | 7725 | total_size += 8; |
| 7729 | } | 7726 | } |
| 7730 | } | ||
| 7731 | av_log(c->fc, AV_LOG_TRACE, "type:'%s' parent:'%s' sz: %"PRId64" %"PRId64" %"PRId64"\n", | 7727 | av_log(c->fc, AV_LOG_TRACE, "type:'%s' parent:'%s' sz: %"PRId64" %"PRId64" %"PRId64"\n", |
| 7732 | av_fourcc2str(a.type), av_fourcc2str(atom.type), a.size, total_size, atom.size); | 7728 | av_fourcc2str(a.type), av_fourcc2str(atom.type), a.size, total_size, atom.size); |
| 7733 | if (a.size == 0) { | 7729 | if (a.size == 0) { |