iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
arch1t3cht 2024-04-18 16:11:10 +02:00
parent 6ccf67359d 2fdd7c70aa 39314072f9 9683959f2e
commit 91b198d12d
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/win_installer/fragment_codecs.iss
View File

@ -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

4
src/bestsource_common.cpp
View File

@ -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)

8
subprojects/freetype2.wrap Normal file
View File

@ -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