[FFmpeg-cvslog] Merge commit '10f77c165c3b3e881bb174a0f57dd62083639072' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 00:40:23 2013 +0200| [683cbbb72142069aa34ce7065ac8c41caa3ddb6d] | committer: Michael Niedermayer

Merge commit '10f77c165c3b3e881bb174a0f57dd62083639072' into release/1.1

* commit '10f77c165c3b3e881bb174a0f57dd62083639072':
  pixdesc: mark gray8 as pseudopal
  mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
  mjpeg: Validate sampling factors
  ljpeg: use the correct number of components in yuv
  wavpack: validate samples size parsed in wavpack_decode_block

Conflicts:
	libavcodec/mjpegdec.c

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

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