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

Conflicts:
	libavcodec/jpegls.c
	libavcodec/jpegls.h
	libavcodec/jpeglsdec.c
	libavcodec/jpeglsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>