• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c5db8b4d
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c5db8b4d
bink.c 44 KB