* commit 'aa7a19b4':
  mjpegdec: check for pixel format changes

Conflicts:
	libavcodec/mjpegdec.c

See: 5c378d6a
See: a2f680c7Merged-by: Michael Niedermayer <michaelni@gmx.at>