Skip to content

Commit 5c0e414

Browse files
committed
Remove inclusion of postproc on FFmpeg
This due to postproc being under GPL. We cannot use this part of the library.
1 parent bd26158 commit 5c0e414

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ 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";
2726
public const string DllNameSwresample = "swresample-5.dll";
2827
public const string DllNameSwscale = "swscale-8.dll";
2928
}
@@ -180,7 +179,6 @@ internal static bool IsFFmpegAvailable(string? checkOnDirectory,
180179
string dllPathAvfilter = Path.Combine(checkOnDirectory, Fields.DllNameAvfilter);
181180
string dllPathAvformat = Path.Combine(checkOnDirectory, Fields.DllNameAvformat);
182181
string dllPathAvutil = Path.Combine(checkOnDirectory, Fields.DllNameAvutil);
183-
string dllPathPostproc = Path.Combine(checkOnDirectory, Fields.DllNamePostproc);
184182
string dllPathSwresample = Path.Combine(checkOnDirectory, Fields.DllNameSwresample);
185183
string dllPathSwscale = Path.Combine(checkOnDirectory, Fields.DllNameSwscale);
186184

@@ -189,7 +187,6 @@ internal static bool IsFFmpegAvailable(string? checkOnDirectory,
189187
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvfilter, out _, out exception) &&
190188
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvformat, out _, out exception) &&
191189
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathAvutil, out _, out exception) &&
192-
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathPostproc, out _, out exception) &&
193190
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathSwresample, out _, out exception) &&
194191
FileUtility.IsFileExistOrSymbolicLinkResolved(dllPathSwscale, out _, out exception);
195192
}
@@ -201,7 +198,6 @@ internal static string[] GetFFmpegRequiredDllFilenames() =>
201198
Fields.DllNameAvfilter,
202199
Fields.DllNameAvformat,
203200
Fields.DllNameAvutil,
204-
Fields.DllNamePostproc,
205201
Fields.DllNameSwresample,
206202
Fields.DllNameSwscale
207203
];
@@ -258,7 +254,6 @@ public static bool TryLinkFFmpegLibrary(
258254
string dllPathAvfilter = Path.Combine(sourceDir, Fields.DllNameAvfilter);
259255
string dllPathAvformat = Path.Combine(sourceDir, Fields.DllNameAvformat);
260256
string dllPathAvutil = Path.Combine(sourceDir, Fields.DllNameAvutil);
261-
string dllPathPostproc = Path.Combine(sourceDir, Fields.DllNamePostproc);
262257
string dllPathSwresample = Path.Combine(sourceDir, Fields.DllNameSwresample);
263258
string dllPathSwscale = Path.Combine(sourceDir, Fields.DllNameSwscale);
264259

@@ -267,7 +262,6 @@ public static bool TryLinkFFmpegLibrary(
267262
CreateSymbolLink(dllPathAvfilter, targetDir, out exception) &&
268263
CreateSymbolLink(dllPathAvformat, targetDir, out exception) &&
269264
CreateSymbolLink(dllPathAvutil, targetDir, out exception) &&
270-
CreateSymbolLink(dllPathPostproc, targetDir, out exception) &&
271265
CreateSymbolLink(dllPathSwresample, targetDir, out exception) &&
272266
CreateSymbolLink(dllPathSwscale, targetDir, out exception);
273267

0 commit comments

Comments
 (0)