Always index all tracks when "Video/Open Audio" is enabled, as it'll always double-index otherwise

Originally committed to SVN as r6518.
This commit is contained in:
Thomas Goyne 2012-02-28 01:22:29 +00:00
parent 93d3895a2a
commit c4cba875b4

View file

@ -127,7 +127,9 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) {
// moment of truth // moment of truth
if (!Index) { 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 // ignore audio decoding errors here, we don't care right now
Index = DoIndexing(Indexer, CacheName, TrackMask, FFMS_IEH_IGNORE); Index = DoIndexing(Indexer, CacheName, TrackMask, FFMS_IEH_IGNORE);
} }