am 400d6125: Merge "Regression test for video/x-matroska."

* commit '400d6125b6f9391e97dca870cf6504d893d9fe21':
  Regression test for video/x-matroska.