Merge commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:31:44 +0000 (04:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:32:16 +0000 (04:32 +0200)
* commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356':
  matroskadec: fix leak on error

Conflicts:
libavformat/matroskadec.c

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

Trivial merge