Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'

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

Conflicts:
	libavcodec/mjpegdec.c

See: 1f41cffe1e3e79620f587545bdfcbd7e6e68ed29

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