Fixes: switch_1080p_720p.mp4
Found-by: Dale Curtis <dalecur...@chromium.org>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavformat/mov.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index f7b5ec7a352..fb5d6f49138 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1222,8 +1222,10 @@ static int mov_read_ftyp(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
int ret = ffio_read_size(pb, type, 4);
if (ret < 0)
return ret;
- if (c->fc->nb_streams)
- return AVERROR_INVALIDDATA;
+ if (c->fc->nb_streams) {
+ av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n");
+ return 0;
+ }
if (strcmp(type, "qt "))
c->isom = 1;
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
