mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Remove a pointless attempt to reindex a file in the ffms2 video provider. It didn't help anything, in fact it just caused crashes since the source object was free'd after the first attempt. Fixes #976.

Browse source 
Originally committed to SVN as r3377.
This commit is contained in:
Karl Blomster 2009-08-07 20:16:13 +00:00
parent 1a182098fc
commit 65fb2e7efa
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/src/video_provider_ffmpegsource.cpp
View file

@ -163,14 +163,9 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) {
// moment of truth // moment of truth
if (!IndexIsValid) { if (!IndexIsValid) {
int TrackMask = Options.AsBool(_T("FFmpegSource always index all tracks")) ? FFMS_TRACKMASK_ALL : FFMS_TRACKMASK_NONE; int TrackMask = Options.AsBool(_T("FFmpegSource always index all tracks")) ? FFMS_TRACKMASK_ALL : FFMS_TRACKMASK_NONE;
try {
try { try {
// ignore audio decoding errors here, we don't care right now // ignore audio decoding errors here, we don't care right now
Index = DoIndexing(Indexer, CacheName, TrackMask, true); Index = DoIndexing(Indexer, CacheName, TrackMask, true);
} catch (...) {
// something borked, try if it works without audio
Index = DoIndexing(Indexer, CacheName, FFMS_TRACKMASK_NONE, true);
}
} catch (wxString temp) { } catch (wxString temp) {
ErrorMsg.Append(temp); ErrorMsg.Append(temp);
throw ErrorMsg; throw ErrorMsg;