[FFmpeg-cvslog] Merge commit '86d0bf0e96bf917e283d24239ce0eed08351da86' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 19:07:21 2013 +0100| [7c72398787316c82cc13d21fe318ec2fb8b991da] | committer: Michael Niedermayer

Merge commit '86d0bf0e96bf917e283d24239ce0eed08351da86' into release/0.10

* commit '86d0bf0e96bf917e283d24239ce0eed08351da86':
  mov: Seek back if overreading an individual atom
  vcr1: add sanity checks
  pictordec: pass correct context to avpriv_request_sample
  dsicinav: Clip the source size to the expected maximum
  alsdec: Clean up error paths
  ogg: Fix potential infinite discard loop
  nuv: check rtjpeg_decode_frame_yuv420 return value

Conflicts:
	libavcodec/pictordec.c

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

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