Merge commit 'ff4fc5ef'
* 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>
Showing
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment