Merge commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 15:56:33 +0000 (12:56 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 16:19:36 +0000 (13:19 -0300)
commitfd59207c1c86c6a76059b3565d340da9f8f47530
tree33323becf3ca7c3b4845acdf4df3bd080d4e92e1
parent13c84b077acecd1e850d41a93dec5c1735d69331
parent827a05eaa9482e9ac2a17f7f2e42ead07c1d7574
Merge commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574'

* commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574':
  matroskaenc: add support for Spherical Video elements

See 58eb0f57f6702d57b6f97ec5010657bb2c076eff. Merged for cosmetics
purposes.
Also includes changes from d32d59bc977b43031007bb2ab21e232f96d2ebcb

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