ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Oct 17 15:26:27 2017 -0300| [9780d5839e12e4d26c829f84978a39aff717a18b] | committer: James Almer
Merge commit '236577230051ad61ec67fa2d68e817d54232d2a0' * commit '236577230051ad61ec67fa2d68e817d54232d2a0': mov: Ignore old spherical metadata when newer version is present Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9780d5839e12e4d26c829f84978a39aff717a18b --- libavformat/mov.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 899690d920..07d57037db 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4953,7 +4953,8 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ goto out; /* Check for mandatory keys and values, try to support XML as best-effort */ - if (av_stristr(buffer, "<GSpherical:StitchingSoftware>") && + if (!sc->spherical && + av_stristr(buffer, "<GSpherical:StitchingSoftware>") && (val = av_stristr(buffer, "<GSpherical:Spherical>")) && av_stristr(val, "true") && (val = av_stristr(buffer, "<GSpherical:Stitched>")) && @@ -4966,7 +4967,7 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ sc->spherical->projection = AV_SPHERICAL_EQUIRECTANGULAR; - if (av_stristr(buffer, "<GSpherical:StereoMode>")) { + if (av_stristr(buffer, "<GSpherical:StereoMode>") && !sc->stereo3d) { enum AVStereo3DType mode; if (av_stristr(buffer, "left-right")) ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
