Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Oct 2011 02:02:03 +0000 (04:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Oct 2011 02:02:03 +0000 (04:02 +0200)
commitc5db8b4d09762f5228eaf3c3a0017657ed27d866
tree59719cfc31a9e112b3f7099392506a6e1e54449f
parent7fb92be7e50ea4ba5712804326c6814ae02dd190
parenta31e9f68a426f634e002282885c6c2eb1bfbea44
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: fix signed overflow in avformat_find_stream_info()
  vp8: fix signed overflows
  motion_est: fix some signed overflows
  dca: fix signed overflow in shift
  aacdec: fix undefined shifts
  bink: Check for various out of bound writes
  bink: Check for out of bound writes when building tree
  put_bits: fix invalid shift by 32 in flush_put_bits()

Conflicts:
libavcodec/bink.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c
libavcodec/bink.c
libavcodec/dca.c
libavcodec/motion_est.c
libavcodec/put_bits.h
libavcodec/vp8.c
libavformat/utils.c