Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 22:46:37 +0000 (23:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 22:52:44 +0000 (23:52 +0100)
commitb3d9ab182929c64d65f36035770dc8d1a8513196
tree0937598968e520968b7a95e9cf043f66102fb9f5
parent84bccae8e9ac02e5088a684b6a7855896c2195eb
parent84cfce9f99805a144df684417e166c1ae6f95421
Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'

* commit '84cfce9f99805a144df684417e166c1ae6f95421':
  matroskadec: K&R formatting cosmetics

Conflicts:
libavformat/matroskadec.c

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