[FFmpeg-cvslog] Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 25 13:51:43 2014 +0200| [59f49667569b5d92a7713b6db75a9e6bfa939079] | committer: Michael Niedermayer

Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'

* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
  lmlm4: K&R formatting cosmetics

Conflicts:
	libavformat/lmlm4.c

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

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