Merge commit '86d0bf0e96bf917e283d24239ce0eed08351da86' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 18:07:21 +0000 (19:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 18:07:21 +0000 (19:07 +0100)
commit7c72398787316c82cc13d21fe318ec2fb8b991da
treee7ea9cacf5199129c08f09d84bd3263dbde0e52e
parent048e28420172ac5c1ae45f492172197dccbc8d00
parent86d0bf0e96bf917e283d24239ce0eed08351da86
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@gmx.at>
libavcodec/alsdec.c
libavcodec/dsicinav.c
libavcodec/nuv.c
libavcodec/vcr1.c
libavformat/mov.c
libavformat/oggdec.c