Commit b3d9ab18 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '84cfce9f'

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

Conflicts:
	libavformat/matroskadec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 84bccae8 84cfce9f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment