* commit 'fa447681':
  ljpegenc: split bgr encoding into a separate function

Conflicts:
	libavcodec/ljpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>