[FFmpeg-cvslog] Merge commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 18 21:12:05 2015 +0200| [f98cad87590e337375f654407bcc64683a7c1294] | committer: Michael Niedermayer

Merge commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e'

* commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e':
  matroskadec: fix crash when parsing invalid mkv

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

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