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

avisynth: Remove option to allow ancient versions 

- This refers to AviSynth < 2.5.6, which is from before 2005
- With the current setup (using GetAVSLinkage, these versions wouldn't
  work anyway)
- The latest AviSynthPlus is bundled with the installer anyway
This commit is contained in:
arch1t3cht 2022-07-05 02:01:35 +02:00
parent 635503affe
commit e644227e95
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/avisynth_wrap.cpp
View File

@ -63,11 +63,7 @@ AviSynthWrapper::AviSynthWrapper() {
if (!CreateScriptEnv)
throw AvisynthError("Failed to get address of CreateScriptEnv from avisynth.dll");
// Require Avisynth 2.5.6+?
if (OPT_GET("Provider/Avisynth/Allow Ancient")->GetBool())
env = CreateScriptEnv(AVISYNTH_INTERFACE_VERSION-1);
else
env = CreateScriptEnv(AVISYNTH_INTERFACE_VERSION);
env = CreateScriptEnv(AVISYNTH_INTERFACE_VERSION);
if (!env)
throw AvisynthError("Failed to create a new avisynth script environment. Avisynth is too old?");

3
src/libresrc/default_config.json
View File

@ -335,8 +335,7 @@
}
},
"Avisynth" : {
"Allow Ancient" : false,
"Memory Max" : 64
"Memory Max" : 128
},
"FFmpegSource" : {
"Cache" : {

3
src/libresrc/osx/default_config.json
View File

@ -335,8 +335,7 @@
}
},
"Avisynth" : {
"Allow Ancient" : false,
"Memory Max" : 64
"Memory Max" : 128
},
"FFmpegSource" : {
"Cache" : {

2
src/preferences.cpp
View File

@ -436,8 +436,6 @@ void Advanced_Video(wxTreebook *book, Preferences *parent) {
#ifdef WITH_AVISYNTH
auto avisynth = p->PageSizer("Avisynth");
p->OptionAdd(avisynth, _("Allow pre-2.56a Avisynth"), "Provider/Avisynth/Allow Ancient");
p->CellSkip(avisynth);
p->OptionAdd(avisynth, _("Avisynth memory limit"), "Provider/Avisynth/Memory Max");
#endif

1
src/project.cpp
View File

@ -53,7 +53,6 @@ Project::Project(agi::Context *c) : context(c) {
OPT_SUB("Audio/Cache/Type", &Project::ReloadAudio, this);
OPT_SUB("Audio/Provider", &Project::ReloadAudio, this);
OPT_SUB("Provider/Audio/FFmpegSource/Decode Error Handling", &Project::ReloadAudio, this);
OPT_SUB("Provider/Avisynth/Allow Ancient", &Project::ReloadVideo, this);
OPT_SUB("Provider/Avisynth/Memory Max", &Project::ReloadVideo, this);
OPT_SUB("Provider/Video/FFmpegSource/Decoding Threads", &Project::ReloadVideo, this);
OPT_SUB("Provider/Video/FFmpegSource/Unsafe Seeking", &Project::ReloadVideo, this);