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)
commit68727a1dc05c5d8a3016da8867d1734e02f45d01
tree93ecec27a7a6198c1d8c596a4c292057459d4145
parent1b6803b79549567b9261208a1c21391e2da570ce
parent251849f06ce36ce8dc076e0fca2922119fa7e39e
Merge commit '251849f06ce36ce8dc076e0fca2922119fa7e39e'

* commit '251849f06ce36ce8dc076e0fca2922119fa7e39e':
  mkv: Add support for Spherical Video elements

See 445204cd5777e029a6674ed0739777817eda5646

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