From c4cba875b40a4e1a546c24148fd39b81918e6494 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 28 Feb 2012 01:22:29 +0000 Subject: [PATCH] Always index all tracks when "Video/Open Audio" is enabled, as it'll always double-index otherwise Originally committed to SVN as r6518. --- aegisub/src/video_provider_ffmpegsource.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 1cfc2d49d..8c574483d 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -127,7 +127,9 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) { // moment of truth if (!Index) { - int TrackMask = OPT_GET("Provider/FFmpegSource/Index All Tracks")->GetBool() ? FFMS_TRACKMASK_ALL : FFMS_TRACKMASK_NONE; + 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); }