Commit 56090b5b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3865ba7b'

* commit '3865ba7b':
  iff: K&R formatting cosmetics

Conflicts:
	libavcodec/iff.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 15cee5e5 3865ba7b
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