Merge commit 'c8fb5d0f383fcbb0da9bdef609c3a826df0064f7' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 14:06:47 +0000 (16:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 14:11:44 +0000 (16:11 +0200)
commit847d3225a8f9e3910d21915db52c3b38986a3fa9
tree2113106109b137eb54665cde6f01db7829d11f9d
parent465742bbbec4e875b2dae21f8f2e3092113f589c
parentc8fb5d0f383fcbb0da9bdef609c3a826df0064f7
Merge commit 'c8fb5d0f383fcbb0da9bdef609c3a826df0064f7' into release/1.1

* commit 'c8fb5d0f383fcbb0da9bdef609c3a826df0064f7':
  Update Changelog
  indeo: check for reference when inheriting mvs
  indeo: use proper error code
  indeo: Properly forward the error codes
  mjpeg: Check the unescaped size for overflows
  wmapro: error out on impossible scale factor offsets
  wmapro: check the min_samples_per_subframe
  wmapro: return early on unsupported condition
  wmapro: check num_vec_coeffs against the actual available buffer
  wmapro: make sure there is room to store the current packet
  lavc: move put_bits_left in put_bits.h
  4xm: do not overread the source buffer in decode_p_block
  4xm: check bitstream_size boundary before using it

Conflicts:
Changelog
libavcodec/4xm.c
libavcodec/mjpegdec.c
libavcodec/wmaprodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/4xm.c
libavcodec/dv.c
libavcodec/ivi_common.c
libavcodec/mjpegdec.c
libavcodec/put_bits.h
libavcodec/wmaprodec.c