diff options
| author | Jacob Trimble <modmaker-at-google.com@ffmpeg.org> | 2017-11-20 12:05:02 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-12-30 21:11:32 +0100 |
| commit | a0eccf673cda83697e8e42d13e10d31a60a45346 (patch) | |
| tree | edb62f411e800e34354e1338dcb63a6ed3b99545 | |
| parent | fa29141e34c99763f091435f74c81d4fbb718fad (diff) | |
| download | ffmpeg-a0eccf673cda83697e8e42d13e10d31a60a45346.tar.gz | |
avformat/mov: Propagate errors in mov_switch_root.
Signed-off-by: Jacob Trimble <modmaker@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2d9cf3bf16b94cd9db10dabad695c69c5cff4f58)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 6ebdf8a4b7..2f6965eabb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6171,6 +6171,7 @@ static int should_retry(AVIOContext *pb, int error_code) { static int mov_switch_root(AVFormatContext *s, int64_t target) { + int ret; MOVContext *mov = s->priv_data; int i, j; int already_read = 0; @@ -6207,8 +6208,10 @@ static int mov_switch_root(AVFormatContext *s, int64_t target) mov->found_mdat = 0; - if (mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 || - avio_feof(s->pb)) + ret = mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }); + if (ret < 0) + return ret; + if (avio_feof(s->pb)) return AVERROR_EOF; av_log(s, AV_LOG_TRACE, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb)); |