[FFmpeg-cvslog] Merge commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 04:31:44 2014 +0200| [45fd5935313bf29f5e09bab7ec49a98d73d9b9af] | committer: Michael Niedermayer

Merge commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356'

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

Conflicts:
	libavformat/matroskadec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45fd5935313bf29f5e09bab7ec49a98d73d9b9af
---