Michael Niedermayer 39354d6089 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@gmx.at>

2013-05-16 09:46:19 +02:00

3.1 KiB

Raw Blame History

View Raw