Browse Source

Do not crash when loading videos that exist but are not MKV

Florian Meißner 10 years ago
parent
commit
f2b963627a
  1. 4
      Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp

4
Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp

@ -70,7 +70,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
{ \
int64_t ret = 0; \
ret = x; \
if (ret == -1) \
if (ret < 0) \
{ \
hsAssert(false, "failed to " err); \
return false; \
@ -216,7 +216,7 @@ bool plMoviePlayer::IOpenMovie()
// it contains everything you ever want to know about the movie
long long pos = 0;
mkvparser::EBMLHeader ebmlHeader;
ebmlHeader.Parse(fReader, pos);
SAFE_OP(ebmlHeader.Parse(fReader, pos), "read mkv header");
mkvparser::Segment* seg;
SAFE_OP(mkvparser::Segment::CreateInstance(fReader, pos, seg), "get segment info");
SAFE_OP(seg->Load(), "load segment from webm");

Loading…
Cancel
Save