* commit 'cfbd98ab':
  mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac

Conflicts:
	libavcodec/mjpegdec.c

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