From a7b254e95ff49af45381c56ccde9c0da76f4a4c2 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 30 Jun 2012 15:27:11 +0000 Subject: [PATCH] Use the user's ffms2 error handling mode when indexing video files to avoid reindexing when opening the audio Originally committed to SVN as r6925. --- aegisub/src/video_provider_ffmpegsource.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index c2f77a60b..cddfdf79b 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -130,8 +130,7 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) { int TrackMask = FFMS_TRACKMASK_NONE; if (OPT_GET("Provider/FFmpegSource/Index All Tracks")->GetBool() || OPT_GET("Video/Open Audio")->GetBool()) TrackMask = FFMS_TRACKMASK_ALL; - // ignore audio decoding errors here, we don't care right now - Index = DoIndexing(Indexer, CacheName, TrackMask, FFMS_IEH_IGNORE); + Index = DoIndexing(Indexer, CacheName, TrackMask, GetErrorHandlingMode()); } // update access time of index file so it won't get cleaned away