Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 12:04:22 +0000 (14:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Jun 2013 12:11:38 +0000 (14:11 +0200)
commitafddf0d9105d2e4f7e6abfab2613fd7ba5747daf
treea7a1c9d3e24db46f47369fec2f480dab4132a290
parente3fb8ac9564b6a3d86c5f60c940f2056a4faae56
parent6765ee7b9cba46818a45b051438b2552f0a1b70a
Merge remote-tracking branch 'qatar/master'

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

Conflicts:
libavcodec/mjpegdec.c

See: a9456c7c5ca883b5a3947e59a9fba5587e18e119

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c