Commit e381cc3e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1c88617b'

* commit '1c88617b':
  riff: K&R formatting cosmetics

Conflicts:
	libavformat/riff.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents de9fbf3d 1c88617b
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