[FFmpeg-cvslog] Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 21 10:49:21 2013 +0200| [f57a7ac9b8e0e55e3722ea82c084ff7d7dc2b2fd] | committer: Michael Niedermayer

Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'

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

Conflicts:
	libavcodec/mjpegdec.c

See: 08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f57a7ac9b8e0e55e3722ea82c084ff7d7dc2b2fd
---