eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '236577230051ad61ec67fa2d68e817d54232d2a0'

Browse Source 
* commit '236577230051ad61ec67fa2d68e817d54232d2a0':
  mov: Ignore old spherical metadata when newer version is present

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-10-17 15:26:27 -03:00
parent 82cddf6374 2365772300
commit 9780d5839e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mov.c
View File

@@ -4953,7 +4953,8 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_
goto out; goto out;
/* Check for mandatory keys and values, try to support XML as best-effort */ /* 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>")) && (val = av_stristr(buffer, "<GSpherical:Spherical>")) &&
av_stristr(val, "true") && av_stristr(val, "true") &&
(val = av_stristr(buffer, "<GSpherical:Stitched>")) && (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; sc->spherical->projection = AV_SPHERICAL_EQUIRECTANGULAR;
if (av_stristr(buffer, "<GSpherical:StereoMode>")) { if (av_stristr(buffer, "<GSpherical:StereoMode>") && !sc->stereo3d) {
enum AVStereo3DType mode; enum AVStereo3DType mode;
if (av_stristr(buffer, "left-right")) if (av_stristr(buffer, "left-right"))