Commit dd7c2e9b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'bb12c2e9'

* commit 'bb12c2e9':
  dsputil: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents db94b144 bb12c2e9
This source diff could not be displayed because it is too large. You can view the blob instead.
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