Merge commit 'f1f6156b'

* commit 'f1f6156b': matroska: K&R formatting cosmetics Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f1f6156b'
* commit 'f1f6156b': matroska: K&R formatting cosmetics Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
8365287e · Michael Niedermayer · 06e5d28e · f1f6156b · 8365287e
Commit 8365287e authored Jul 01, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 247 additions and 204 deletions

matroskaenc.c libavformat/matroskaenc.c +247 -204

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