Merge commit '84cfce9f'

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

Merge commit '84cfce9f'
* commit '84cfce9f': matroskadec: K&R formatting cosmetics Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
b3d9ab18 · Michael Niedermayer · 84bccae8 · 84cfce9f · b3d9ab18
Commit b3d9ab18 authored Mar 07, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 573 additions and 490 deletions

matroskadec.c libavformat/matroskadec.c +573 -490

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