diff --git a/src/audio_provider_bestsource.cpp b/src/audio_provider_bestsource.cpp
index df68fda63..3198d3094 100644
--- a/src/audio_provider_bestsource.cpp
+++ b/src/audio_provider_bestsource.cpp
@@ -67,7 +67,7 @@ BSAudioProvider::BSAudioProvider(agi::fs::path const& filename, agi::BackgroundR
 		ps->SetTitle(from_wx(_("Indexing")));
 		ps->SetMessage(from_wx(_("Indexing file... This will take a while!")));
 		try {
-			bs = agi::make_unique<BestAudioSource>(filename.string(), static_cast<int>(track), -1, false, 0, 1, provider_bs::GetCacheFile(filename), &bsopts, 0, [=](int Track, int64_t Current, int64_t Total) {
+			bs = agi::make_unique<BestAudioSource>(filename.string(), static_cast<int>(track), -1, 0, 1, provider_bs::GetCacheFile(filename), &bsopts, 0, [=](int Track, int64_t Current, int64_t Total) {
 				ps->SetProgress(Current, Total);
 				return !ps->IsCancelled();
 			});
diff --git a/src/bestsource_common.cpp b/src/bestsource_common.cpp
index 9e44daf68..df17d8cf5 100644
--- a/src/bestsource_common.cpp
+++ b/src/bestsource_common.cpp
@@ -56,7 +56,18 @@ std::pair<TrackSelection, bool> SelectTrack(agi::fs::path const& filename, bool
 
 		if (info.MediaType == type) {
 			TrackNumbers.push_back(i);
-			Choices.Add(agi::wxformat(_("Track %02d: %s"), i, info.CodecString));
+			std::map<std::string, std::string> metadata = tracklist.GetTrackMetadata(i);
+			wxString description = agi::wxformat(_("Track %02d: %s"), i, info.CodecString);
+
+			if (metadata.count("language") > 0) {
+				description += agi::wxformat(_(" - [%s]"), metadata["language"]);
+			}
+
+			if (metadata.count("title") > 0) {
+				description += agi::wxformat(_(" - %s"), metadata["title"]);
+			}
+
+			Choices.Add(description);
 		}
 	}
 
diff --git a/src/video_provider_bestsource.cpp b/src/video_provider_bestsource.cpp
index d640d7008..0a269dc90 100644
--- a/src/video_provider_bestsource.cpp
+++ b/src/video_provider_bestsource.cpp
@@ -116,7 +116,7 @@ BSVideoProvider::BSVideoProvider(agi::fs::path const& filename, std::string cons
 		ps->SetTitle(from_wx(_("Indexing")));
 		ps->SetMessage(from_wx(_("Decoding the full track to ensure perfect frame accuracy. This will take a while!")));
 		try {
-			bs = agi::make_unique<BestVideoSource>(filename.string(), "", 0, static_cast<int>(track_info.first), false, OPT_GET("Provider/Video/BestSource/Threads")->GetInt(), 1, provider_bs::GetCacheFile(filename), &bsopts, [=](int Track, int64_t Current, int64_t Total) {
+			bs = agi::make_unique<BestVideoSource>(filename.string(), "", 0, static_cast<int>(track_info.first), 0, OPT_GET("Provider/Video/BestSource/Threads")->GetInt(), 1, provider_bs::GetCacheFile(filename), &bsopts, [=](int Track, int64_t Current, int64_t Total) {
 				ps->SetProgress(Current, Total);
 				return !ps->IsCancelled();
 			});
diff --git a/subprojects/bestsource.wrap b/subprojects/bestsource.wrap
index 4df85ca2d..dd21d70eb 100644
--- a/subprojects/bestsource.wrap
+++ b/subprojects/bestsource.wrap
@@ -1,8 +1,7 @@
 [wrap-git]
 url = https://github.com/vapoursynth/bestsource
-revision = R8
+revision = R9
 clone-recursive = true
-diff_files = bestsource/0001.patch
 
 [provide]
 bestsource = bestsource_dep
diff --git a/subprojects/ffmpeg.wrap b/subprojects/ffmpeg.wrap
index 811b3740f..929be934c 100644
--- a/subprojects/ffmpeg.wrap
+++ b/subprojects/ffmpeg.wrap
@@ -1,7 +1,7 @@
 [wrap-git]
 directory = ffmpeg
 url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
-revision = meson-6.1
+revision = meson-7.1
 depth = 1
 
 [provide]
diff --git a/subprojects/packagefiles/bestsource/0001.patch b/subprojects/packagefiles/bestsource/0001.patch
deleted file mode 100644
index 4c3862b66..000000000
--- a/subprojects/packagefiles/bestsource/0001.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 6017b15..eec9249 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2,10 +2,7 @@ project('BestSource', 'cpp',
-     default_options: ['buildtype=release', 'b_ndebug=if-release', 'cpp_std=c++17'],
-     license: 'MIT',
-     meson_version: '>=0.53.0',
--    version: '.'.join([
--        run_command('grep', 'BEST_SOURCE_VERSION_MAJOR', 'src/version.h', check: true).stdout().strip().split()[2],
--        run_command('grep', 'BEST_SOURCE_VERSION_MINOR', 'src/version.h', check: true).stdout().strip().split()[2],
--    ])
-+    version: '6.0'
- )
- 
- api_sources = files(