summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-17 16:47:30 -0300
committerJames Almer <jamrial@gmail.com>2017-10-17 16:47:30 -0300
commit68727a1dc05c5d8a3016da8867d1734e02f45d01 (patch)
tree93ecec27a7a6198c1d8c596a4c292057459d4145 /libavformat
parent1b6803b79549567b9261208a1c21391e2da570ce (diff)
parent251849f06ce36ce8dc076e0fca2922119fa7e39e (diff)
Merge commit '251849f06ce36ce8dc076e0fca2922119fa7e39e'
* commit '251849f06ce36ce8dc076e0fca2922119fa7e39e': mkv: Add support for Spherical Video elements See 445204cd5777e029a6674ed0739777817eda5646 Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskadec.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 94a56ebfa7..cdb2e20bb1 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1996,11 +1996,12 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
spherical = av_spherical_alloc(&spherical_size);
if (!spherical)
return AVERROR(ENOMEM);
+
spherical->projection = projection;
- spherical->yaw = (int32_t)(track->video.projection.yaw * (1 << 16));
- spherical->pitch = (int32_t)(track->video.projection.pitch * (1 << 16));
- spherical->roll = (int32_t)(track->video.projection.roll * (1 << 16));
+ spherical->yaw = (int32_t) (track->video.projection.yaw * (1 << 16));
+ spherical->pitch = (int32_t) (track->video.projection.pitch * (1 << 16));
+ spherical->roll = (int32_t) (track->video.projection.roll * (1 << 16));
spherical->padding = padding;