diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 23:58:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-16 00:02:39 +0200 |
| commit | 38b701a3492446d7601336c4938fed2b822aa163 (patch) | |
| tree | a078fa4771f33e0808a948a4e1cf3ae50bb22440 | |
| parent | 0b95f01140d0debe5ff6bf54d7490ade7c00421b (diff) | |
| parent | 5b4eb243bce10a3e8345401a353749e0414c54ca (diff) | |
| download | ffmpeg-38b701a3492446d7601336c4938fed2b822aa163.tar.gz | |
Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'
* commit '5b4eb243bce10a3e8345401a353749e0414c54ca':
mov: Seek back if overreading an individual atom
Conflicts:
libavformat/mov.c
See: 6093960ae35c8d69c559b5604f683c2ea3f279ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index a9ca1c4bf7..c23e5ec1b4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2956,8 +2956,10 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) left = a.size - avio_tell(pb) + start_pos; if (left > 0) /* skip garbage at atom end */ avio_skip(pb, left); - else if(left < 0) { - av_log(c->fc, AV_LOG_DEBUG, "undoing overread of %"PRId64" in '%.4s'\n", -left, (char*)&a.type); + else if (left < 0) { + av_log(c->fc, AV_LOG_WARNING, + "overread end of atom '%.4s' by %"PRId64" bytes\n", + (char*)&a.type, -left); avio_seek(pb, left, SEEK_CUR); } } |