Merge branches 'bugfixes', 'bestsource' and 'vapoursynth' into feature

arch1t3cht · Apr 18, 2024 · 3d997d7 · 3d997d7
4 parents 4b42664 + 2fdd7c7 + 3931407 + 9683959
commit 3d997d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/win_installer/fragment_codecs.iss b/packages/win_installer/fragment_codecs.iss
@@ -7,6 +7,6 @@ DestDir: {app}; Source: {#DEPS_DIR}\AvisynthPlus64\x64\Output\plugins\DirectShow
 DestDir: {app}\csri; Source: {#DEPS_DIR}\VSFilter\x64\VSFilter.dll; Flags: ignoreversion; Components: main
 ; VapourSynth
 DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\L-SMASH-Works\libvslsmashsource.dll; Flags: ignoreversion; Components: vapoursynth
-DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\BestSource\x64\BestSource.dll; Flags: ignoreversion; Components: vapoursynth
+DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\BestSource\BestSource.dll; Flags: ignoreversion; Components: vapoursynth
 DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\SCXVid\libscxvid.dll; Flags: ignoreversion; Components: vapoursynth
 DestDir: {app}\vapoursynth; Source: {#DEPS_DIR}\WWXD\libwwxd64.dll; Flags: ignoreversion; Components: vapoursynth
diff --git a/src/bestsource_common.cpp b/src/bestsource_common.cpp
@@ -68,8 +68,8 @@ std::pair<TrackSelection, bool> SelectTrack(agi::fs::path const& filename, bool
 		result = static_cast<TrackSelection>(TrackNumbers[0]);
 	} else {
 		int Choice = wxGetSingleChoiceIndex(
-			audio ? _("Multiple video tracks detected, please choose the one you wish to load:") : _("Multiple audio tracks detected, please choose the one you wish to load:"),
-			audio ? _("Choose video track") : _("Choose audio track"),
+			audio ? _("Multiple audio tracks detected, please choose the one you wish to load:") : _("Multiple video tracks detected, please choose the one you wish to load:"),
+			audio ? _("Choose audio track") : _("Choose video track"),
 			Choices);
 
 		if (Choice >= 0)

diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+directory = freetype2
+url = https://gitlab.freedesktop.org/freetype/freetype.git
+revision = master
+
+[provide]
+freetype = freetype_dep
+freetype2 = freetype_dep