[FFmpeg-cvslog] Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  1 20:22:51 2014 +0200| [ee78b0c252e54b7e26043d060b45c22654719ffb] | committer: Michael Niedermayer

Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'

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

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee78b0c252e54b7e26043d060b45c22654719ffb
---