Commit 45fd5935 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3c1199c3'

* commit '3c1199c3':
  matroskadec: fix leak on error

Conflicts:
	libavformat/matroskadec.c

See: 2fe4b621Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 97a8f4dd 3c1199c3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment