* commit '199d9f99':
  mjpegdec: fix undefined shift

Conflicts:
	libavcodec/mjpegdec.c

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