From 65fb2e7efaf96869d48d6cb16134f86b9ffbe1e8 Mon Sep 17 00:00:00 2001 From: Karl Blomster Date: Fri, 7 Aug 2009 20:16:13 +0000 Subject: [PATCH] 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. Originally committed to SVN as r3377. --- aegisub/src/video_provider_ffmpegsource.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 9715d0e80..a8a1a071e 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -164,13 +164,8 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) { if (!IndexIsValid) { int TrackMask = Options.AsBool(_T("FFmpegSource always index all tracks")) ? FFMS_TRACKMASK_ALL : FFMS_TRACKMASK_NONE; try { - try { - // ignore audio decoding errors here, we don't care right now - Index = DoIndexing(Indexer, CacheName, TrackMask, true); - } catch (...) { - // something borked, try if it works without audio - Index = DoIndexing(Indexer, CacheName, FFMS_TRACKMASK_NONE, true); - } + // ignore audio decoding errors here, we don't care right now + Index = DoIndexing(Indexer, CacheName, TrackMask, true); } catch (wxString temp) { ErrorMsg.Append(temp); throw ErrorMsg;