[FFmpeg-cvslog] Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 28 12:18:18 2013 +0200| [2ac6d6b7cdd48b21f021221fec186d1ab424994a] | committer: Michael Niedermayer

Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'

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

Conflicts:
	libavformat/omadec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ac6d6b7cdd48b21f021221fec186d1ab424994a
---