* commit 'a030279a':
  ljpeg: use the correct number of components in yuv

Conflicts:
	libavcodec/mjpegdec.c

See: b2e57eb5Merged-by: Michael Niedermayer <michaelni@gmx.at>