Merge commit '6222ee068eeb3d29a2bcc4a89ce31effdef5a061' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:11:22 +0000 (13:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:11:26 +0000 (13:11 +0100)
commit31b697f19c0a6e11fc7832500314a3366e7631be
tree7ea45b85ca49c290dc3fbfbb7feb63d6976ba0ca
parentc5f52a9440e7786459b322d9db5b2f9ced746571
parent6222ee068eeb3d29a2bcc4a89ce31effdef5a061
Merge commit '6222ee068eeb3d29a2bcc4a89ce31effdef5a061' into release/1.1

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

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