Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 18:22:51 +0000 (20:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 18:25:35 +0000 (20:25 +0200)
commitee78b0c252e54b7e26043d060b45c22654719ffb
tree386d80027aea198ddca996c7a7c5121c25b1460e
parent8365287e613d82e8fc1e842878cbbe285c1d592d
parentb75a1f9892b5b715397edbf837e4d4cda337907b
Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'

* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b':
  matroska: Factor out write_track from mkv_write_tracks

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c