Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Jan 2012 23:32:38 +0000 (00:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Jan 2012 23:32:38 +0000 (00:32 +0100)
commit9273efac1b9ef79ca0ea5673d8088c501e19d70f
tree844f8c736972c6f2e5669fc5810acb46c769f65f
parentb1435626392bd05bd3e79a56d9f64c089654afda
parentccc27e2139336b66cdec3bb73a2cc7e60ef7e599
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  bfi: Use bytestream2 functions to prevent buffer overreads.
  dpcm: Fix invalid writes
  utvideo: frame multithreading.
  vorbis: An additional defense in the Vorbis codec.
  vorbisdec: Fix decoding bug with channel handling

Conflicts:
libavcodec/dpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bfi.c
libavcodec/dpcm.c
libavcodec/utvideo.c