[FFmpeg-cvslog] Merge commit '0af5a774ebc96ae9018926dc8b276c7f39767e3e' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 00:16:52 2013 +0200| [cff8d01e15174aeafa91158ccb7576f9a607d1bf] | committer: Michael Niedermayer

Merge commit '0af5a774ebc96ae9018926dc8b276c7f39767e3e' into release/1.1

* commit '0af5a774ebc96ae9018926dc8b276c7f39767e3e':
  jpegls: check the scan offset
  jpegls: factorize return paths
  jpegls: return meaningful errors
  mpegvideo: allocate sufficiently large scratch buffer for interlaced vid

Conflicts:
	libavcodec/jpeglsdec.c
	libavcodec/mpegvideo.c

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

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