Skip to content

Commit 0875136

Browse files
committed
Revert "Remove inclusion of postproc on FFmpeg"
This reverts commit 5c0e414.
1 parent 5c0e414 commit 0875136

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

CollapseLauncher/Classes/GameManagement/ImageBackground/ImageBackgroundManager.FFmpeg.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ file static class Fields
2323
public const string DllNameAvfilter = "avfilter-10.dll";
2424
public const string DllNameAvformat = "avformat-61.dll";
2525
public const string DllNameAvutil = "avutil-59.dll";
26+
public const string DllNamePostproc = "postproc-58.dll";
2627
public const string DllNameSwresample = "swresample-5.dll";
2728
public const string DllNameSwscale = "swscale-8.dll";
2829
}
@@ -179,6 +180,7 @@ internal static bool IsFFmpegAvailable(string? checkOnDirectory,
179180
string dllPathAvfilter = Path.Combine(checkOnDirectory, Fields.DllNameAvfilter);
180181
string dllPathAvformat = Path.Combine(checkOnDirectory, Fields.DllNameAvformat);
181182
string dllPathAvutil = Path.Combine(checkOnDirectory, Fields.DllNameAvutil);
183+
string dllPathPostproc = Path.Combine(checkOnDirectory, Fields.DllNamePostproc);
182184
string dllPathSwresample = Path.Combine(checkOnDirectory, Fields.DllNameSwresample);
183185
string dllPathSwscale = Path.Combine(checkOnDirectory, Fields.DllNameSwscale);
184186

@@ -187,6 +189,7 @@ internal static bool IsFFmpegAvailable(string? checkOnDirectory,
187189
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvfilter, out _, out exception) &&
188190
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvformat, out _, out exception) &&
189191
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvutil, out _, out exception) &&
192+
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathPostproc, out _, out exception) &&
190193
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathSwresample, out _, out exception) &&
191194
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathSwscale, out _, out exception);
192195
}
@@ -198,6 +201,7 @@ internal static string[] GetFFmpegRequiredDllFilenames() =>
198201
Fields.DllNameAvfilter,
199202
Fields.DllNameAvformat,
200203
Fields.DllNameAvutil,
204+
Fields.DllNamePostproc,
201205
Fields.DllNameSwresample,
202206
Fields.DllNameSwscale
203207
];
@@ -254,6 +258,7 @@ public static bool TryLinkFFmpegLibrary(
254258
string dllPathAvfilter = Path.Combine(sourceDir, Fields.DllNameAvfilter);
255259
string dllPathAvformat = Path.Combine(sourceDir, Fields.DllNameAvformat);
256260
string dllPathAvutil = Path.Combine(sourceDir, Fields.DllNameAvutil);
261+
string dllPathPostproc = Path.Combine(sourceDir, Fields.DllNamePostproc);
257262
string dllPathSwresample = Path.Combine(sourceDir, Fields.DllNameSwresample);
258263
string dllPathSwscale = Path.Combine(sourceDir, Fields.DllNameSwscale);
259264

@@ -262,6 +267,7 @@ public static bool TryLinkFFmpegLibrary(
262267
CreateSymbolLink(dllPathAvfilter, targetDir, out exception) &&
263268
CreateSymbolLink(dllPathAvformat, targetDir, out exception) &&
264269
CreateSymbolLink(dllPathAvutil, targetDir, out exception) &&
270+
CreateSymbolLink(dllPathPostproc, targetDir, out exception) &&
265271
CreateSymbolLink(dllPathSwresample, targetDir, out exception) &&
266272
CreateSymbolLink(dllPathSwscale, targetDir, out exception);
267273

0 commit comments

Comments
 (0)