Signed-off-by: Jacob Trimble <modma...@google.com>
---
libavformat/mov.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index d49d820d2b..c5f07595df 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -6747,6 +6747,7 @@ static int should_retry(AVIOContext *pb, int error_code) {
static int mov_switch_root(AVFormatContext *s, int64_t target, int index)
{
+ int ret;
MOVContext *mov = s->priv_data;
if (index >= 0 && index < mov->frag_index.nb_items)
@@ -6769,8 +6770,9 @@ static int mov_switch_root(AVFormatContext *s, int64_t
target, int index)
mov->found_mdat = 0;
- if (mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX })
< 0 ||
- avio_feof(s->pb))
+ if ((ret = mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"),
INT64_MAX })) < 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));
--
2.15.0.448.gf294e3d99a-goog
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
