Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 08:49:21 +0000 (10:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 08:50:03 +0000 (10:50 +0200)
commitf57a7ac9b8e0e55e3722ea82c084ff7d7dc2b2fd
treef2bbe85f6038dc86431bc21873119ab62aa68708
parent5a65fea655fb2558a3004a93f782c1534dd6a363
parent8aa3500905fec6c4e657bb291b861d43c34d3de9
Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'

* commit '8aa3500905fec6c4e657bb291b861d43c34d3de9':
  mjpeg: Validate sampling factors

Conflicts:
libavcodec/mjpegdec.c

See: 08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886

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