Commit 8610751d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a84616b7'

* commit 'a84616b7':
  mpegvideo: K&R formatting cosmetics

Conflicts:
	libavcodec/mpegvideo_motion.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 10c6d1b2 a84616b7
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