* qatar/master:
  mjpeg: Check the unescaped size for overflows

Conflicts:
	libavcodec/mjpegdec.c

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