Merge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:46:52 +0000 (00:46 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:46:52 +0000 (00:46 -0300)
commitf5c67c431ef9d60deb6451d6499e10b9ad510335
treec94d264d85bea3a917d2b1e554ef84db9ab0f144
parenta629bc99fd111f9275c1e3b54dc358efeeae18d9
parent55fe72a841ba306370e68e86c88f34b4456aa4dd
Merge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'

* commit '55fe72a841ba306370e68e86c88f34b4456aa4dd':
  matroskadec: don't warn about unknown spherical medata when none is present

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