From 9f7bdd8d17f03a0bf13fac88d96734db9dfd7376 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 16 Jun 2012 04:10:32 +0000 Subject: [PATCH] Don't force ffms2 threads to 1 if it's recent enough Originally committed to SVN as r6909. --- aegisub/src/video_provider_ffmpegsource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 4d449ad5b..c2f77a60b 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -150,7 +150,7 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) { // set thread count int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt(); - if (FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF) + if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF) Threads = 1; // set seekmode