Merge commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356'

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

Conflicts:
	libavformat/matroskadec.c

See: 2fe4b6210c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/75/merge
Michael Niedermayer 11 years ago
commit 45fd593531

Diff Content Not Available