Commit 2ac6d6b7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c1401054'

* commit 'c1401054':
  oma: K&R formatting cosmetics

Conflicts:
	libavformat/omadec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5fd254c4 c1401054
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