Merge commit '532c96a2158c04f265d750d54f2f103b8d9fe0ef' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Feb 2015 19:32:46 +0000 (20:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Feb 2015 19:32:53 +0000 (20:32 +0100)
commit92595faab9f4b218e9c1a1d4043b1225da6f23af
treee5c4c337ee05c16edf3437f5887ac8040948d868
parent9d1e775b8966ed397f5819fe36dc933f8049b75e
parent532c96a2158c04f265d750d54f2f103b8d9fe0ef
Merge commit '532c96a2158c04f265d750d54f2f103b8d9fe0ef' into release/2.4

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

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