Merge commit 'e3453fd44480d903338c663238bf280215dd9a07'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:25:58 +0000 (23:25 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:25:58 +0000 (23:25 +0100)
commitee865e9780b40294f073d590f66f7df54745ad9f
tree48e38cc899aadef5bf22ded8d1f18ccb5c97cb88
parent2d2af18f42c908d3126c105b0e8745ac7ba39350
parente3453fd44480d903338c663238bf280215dd9a07
Merge commit 'e3453fd44480d903338c663238bf280215dd9a07'

* commit 'e3453fd44480d903338c663238bf280215dd9a07':
  matroska: Write the field order information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv