]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'a0fa6d06b848f26b16ba12f0a9a4a85b93ab8022'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 13:51:23 +0000 (14:51 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 13:51:23 +0000 (14:51 +0100)
* commit 'a0fa6d06b848f26b16ba12f0a9a4a85b93ab8022':
  matroska: Warn when metadata references a non-existent element

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/matroskadec.c

Simple merge