diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-17 15:26:27 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-17 15:26:27 -0300 |
| commit | 9780d5839e12e4d26c829f84978a39aff717a18b (patch) | |
| tree | e786914afd4baa1b487d9cadb4d912fd31f44ba5 /libavformat | |
| parent | 82cddf6374017aca4e893f354ab01f05f14a60b5 (diff) | |
| parent | 236577230051ad61ec67fa2d68e817d54232d2a0 (diff) | |
Merge commit '236577230051ad61ec67fa2d68e817d54232d2a0'
* commit '236577230051ad61ec67fa2d68e817d54232d2a0':
mov: Ignore old spherical metadata when newer version is present
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files 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")) |