[FFmpeg-cvslog] Merge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 19 01:06:29 2014 +0100| [543a46e0d1f32ab162f2dc9fd0233d9831b6f805] | committer: Michael Niedermayer

Merge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0'

* commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0':
  libopenjpeg: K&R formatting cosmetics

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c

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

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