Commit f3968ab4 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '49fe9c05'

* commit '49fe9c05':
  oggparsevorbis: K&R formatting cosmetics

Conflicts:
	libavformat/oggparsevorbis.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 90e1fc8b 49fe9c05
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