Merge commit '50493f1f7d2235db811d2991b9e5b330baf7c05a' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:42:27 +0000 (19:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:42:46 +0000 (19:42 +0200)
commit2ec8e46550dc6a7df34d253484b43c47de833348
treebf7a452044cdbc474d5c880cc923cb7e86972f92
parentb5ae0e349adc1c9581a6d88e9ba55cc5dd4493c2
parent50493f1f7d2235db811d2991b9e5b330baf7c05a
Merge commit '50493f1f7d2235db811d2991b9e5b330baf7c05a' into release/0.10

* commit '50493f1f7d2235db811d2991b9e5b330baf7c05a':
  twinvq: fix out of bounds array access

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