Commit fecebb7a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5b8f0a5e'

* commit '5b8f0a5e':
  mpeg: K&R formatting cosmetics

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