mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/mov: Propagate errors in mov_switch_root.
Signed-off-by: Jacob Trimble <modmaker@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
bce8fc0754
commit
2d9cf3bf16
|
@ -6753,6 +6753,7 @@ static int should_retry(AVIOContext *pb, int error_code) {
|
||||||
|
|
||||||
static int mov_switch_root(AVFormatContext *s, int64_t target, int index)
|
static int mov_switch_root(AVFormatContext *s, int64_t target, int index)
|
||||||
{
|
{
|
||||||
|
int ret;
|
||||||
MOVContext *mov = s->priv_data;
|
MOVContext *mov = s->priv_data;
|
||||||
|
|
||||||
if (index >= 0 && index < mov->frag_index.nb_items)
|
if (index >= 0 && index < mov->frag_index.nb_items)
|
||||||
|
@ -6775,8 +6776,10 @@ static int mov_switch_root(AVFormatContext *s, int64_t target, int index)
|
||||||
|
|
||||||
mov->found_mdat = 0;
|
mov->found_mdat = 0;
|
||||||
|
|
||||||
if (mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 ||
|
ret = mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX });
|
||||||
avio_feof(s->pb))
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
if (avio_feof(s->pb))
|
||||||
return AVERROR_EOF;
|
return AVERROR_EOF;
|
||||||
av_log(s, AV_LOG_TRACE, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb));
|
av_log(s, AV_LOG_TRACE, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue