[FFmpeg-cvslog] Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 16 09:46:19 2013 +0200| [39354d608933fe37a5ec86de4c691bcb46df0dac] | committer: Michael Niedermayer

Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'

* commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec':
  jpegls: K&R formatting cosmetics

Conflicts:
	libavcodec/jpegls.c
	libavcodec/jpegls.h
	libavcodec/jpeglsdec.c
	libavcodec/jpeglsenc.c

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

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