[vlc-commits] Add try/catch when reading elements with libmatroska.

[Denis Charmet]

vlc/vlc-2.0 | branch: master | Denis Charmet <typx at dinauz.org> | Sat Apr 27 02:44:32 2013 +0200| [55d4d4713bba02ebc7c5e16d67704ead08f40a79] | committer: Denis Charmet

Add try/catch when reading elements with libmatroska.
(cherry picked from commit 59c9e8309d5b435a2d85c2c9eaae979ba56ccdd9)

Conflicts:
	modules/demux/mkv/matroska_segment.cpp

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=55d4d4713bba02ebc7c5e16d67704ead08f40a79
---

 modules/demux/mkv/demux.cpp                  |   27 ++-
 modules/demux/mkv/matroska_segment.cpp       |  306 +++++++++++++++-----------
 modules/demux/mkv/matroska_segment_parse.cpp |  130 +++++++----
 3 files changed, 286 insertions(+), 177 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=55d4d4713bba02ebc7c5e16d67704ead08f40a79