Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 09:51:49 +0000 (11:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 10:01:37 +0000 (12:01 +0200)
commit6ef7b6af6be0a1f8d4b355ccb692289857d1f967
treea3b527b04b2364baf2649fe9167d9aa4f3c352ca
parent877cae6effefb1695bb519070cf5df785ded4415
parentcfbd98abe82cfcb9984a18d08697251b72b110c8
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>
libavcodec/mjpegdec.c