]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a629bc9 55fe72a)
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)
* commit '55fe72a841ba306370e68e86c88f34b4456aa4dd':
  matroskadec: don't warn about unknown spherical medata when none is present

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavformat/matroskadec.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/matroskadec.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.