Merge commit '251849f06ce36ce8dc076e0fca2922119fa7e39e'
authorJames Almer <jamrial@gmail.com>
Tue, 17 Oct 2017 19:47:30 +0000 (16:47 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 17 Oct 2017 19:47:30 +0000 (16:47 -0300)
* commit '251849f06ce36ce8dc076e0fca2922119fa7e39e':
  mkv: Add support for Spherical Video elements

See 445204cd5777e029a6674ed0739777817eda5646

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavformat/matroskadec.c

@@@ -1996,19 -1624,13 +1996,20 @@@ static int mkv_parse_video_projection(A
      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;
 +
 +    spherical->bound_left   = l;
 +    spherical->bound_top    = t;
 +    spherical->bound_right  = r;
 +    spherical->bound_bottom = b;
 +
      ret = av_stream_add_side_data(st, AV_PKT_DATA_SPHERICAL, (uint8_t *)spherical,
                                    spherical_size);
      if (ret < 0) {