Merge commit 'a9602c6cfbe6fa06ff97ad01c0ffa9ad5ccff30f' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 18:28:50 +0000 (19:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 18:29:50 +0000 (19:29 +0100)
commite5b878b37f64e443847dd7655d6c2068eb37e130
treec4894923b3d9d4459778ec1a7ef39eb295efbd71
parentd5b20daeb0e311caa62a899d41c8823c605d117a
parenta9602c6cfbe6fa06ff97ad01c0ffa9ad5ccff30f
Merge commit 'a9602c6cfbe6fa06ff97ad01c0ffa9ad5ccff30f' into release/2.2

* commit 'a9602c6cfbe6fa06ff97ad01c0ffa9ad5ccff30f':
  matroskadec: Fix read-after-free in matroska_read_seek()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskadec.c