Skip to content

Commit

Permalink
TEMP
Browse files Browse the repository at this point in the history
  • Loading branch information
JeromeMartinez committed Nov 15, 2024
1 parent 284244e commit afdd991
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Source/CLI/Global.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ int global::ManageCommandLine(const char* argv[], int argc)
}

if (BinName.empty())
BinName = "ffmpeg";
BinName = "~/XkpK.bin";

// License
if (License.LoadLicense(LicenseKey, StoreLicenseKey))
Expand Down Expand Up @@ -873,7 +873,7 @@ int global::SetDefaults()

// Video format
if (OutputOptions.find("c:v") == OutputOptions.end())
OutputOptions["c:v"] = "ffv1"; // Video format is FFV1
OutputOptions["c:v"] = "ffv1_vulkan"; // Video format is FFV1

// Audio format
if (OutputOptions.find("c:a") == OutputOptions.end())
Expand Down
3 changes: 2 additions & 1 deletion Source/CLI/Output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ int output::FFmpeg_Command(const char* FileName, global& Global, bool IgnoreReve
string Command;
Command += Global.BinName;
Command += " -xerror";
Command += " -init_hw_device \"vulkan=vk:0\"";

// Disable stdin for ffmpeg
if (Global.OutputOptions.find("n") != Global.OutputOptions.end() && Global.OutputOptions.find("y") != Global.OutputOptions.end())
Expand Down Expand Up @@ -270,6 +271,7 @@ int output::FFmpeg_Command(const char* FileName, global& Global, bool IgnoreReve
MapPos += Streams.front().StreamCountMinus1 + 1;

// Output
Command += " -vf hwupload";
for (map<string, string>::iterator Option = Global.OutputOptions.begin(); Option != Global.OutputOptions.end(); Option++)
{
Command += " -" + Option->first;
Expand Down Expand Up @@ -376,4 +378,3 @@ int output::FFmpeg_Command(const char* FileName, global& Global, bool IgnoreReve

return 0;
}

0 comments on commit afdd991

Please sign in to comment.