Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Sep 2014 11:51:43 +0000 (13:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Sep 2014 11:51:43 +0000 (13:51 +0200)
commit59f49667569b5d92a7713b6db75a9e6bfa939079
treefcb899c432d721855f33febba1f00fd32298268a
parent8f3d3e5f8373d64f4b05dd1908c048dc0e49e21f
parent86a361081d3eb4e999d75bc2a462f01d88cbd2e5
Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'

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

Conflicts:
libavformat/lmlm4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/lmlm4.c