tree d9b2115c63a03d547094eb5e430297e5339f0b92
parent e75056bc549fe13bb6d29a8a67a6a2babf060417
parent 7ee536e87a569174775dabdd959a9b12c1d2ac3d
author Michael Niedermayer <michaelni@gmx.at> 1325995415 +0100
committer Michael Niedermayer <michaelni@gmx.at> 1325995419 +0100

Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* qatar/release/0.5:
  matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
  vorbis: Avoid some out-of-bounds reads
  vp3: fix oob read for negative tokens and memleaks on error.

Merged-by: Michael Niedermayer <michaelni@gmx.at>