Merge commit 'b75a1f98'

* commit 'b75a1f98': matroska: Factor out write_track from mkv_write_tracks Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b75a1f98'
* commit 'b75a1f98': matroska: Factor out write_track from mkv_write_tracks Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
ee78b0c2 · Michael Niedermayer · 8365287e · b75a1f98 · ee78b0c2
Commit ee78b0c2 authored Jul 01, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 275 additions and 251 deletions

matroskaenc.c libavformat/matroskaenc.c +275 -251

No files found.
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c