Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2024-09-20 05:22:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: bump system.text.json to v8.0.4

Browse source
This commit is contained in:
Kaaybi 2024-09-18 12:13:25 +02:00
parent eb221c3e49
commit d5a2e5cbe6
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FFMpegCore/FFMpegCore.csproj
View file

@ -18,7 +18,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Instances" Version="3.0.0" /> <PackageReference Include="Instances" Version="3.0.0" />
<PackageReference Include="System.Text.Json" Version="7.0.3" /> <PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>

13
FFMpegCore/FFOptions.cs
View file

@ -1,4 +1,5 @@
using System.Text; using System.Text;
using System.Text.Json.Serialization;
using FFMpegCore.Enums; using FFMpegCore.Enums;
namespace FFMpegCore namespace FFMpegCore
@ -20,10 +21,20 @@ public class FFOptions : ICloneable
/// </summary> /// </summary>
public string TemporaryFilesFolder { get; set; } = Path.GetTempPath(); public string TemporaryFilesFolder { get; set; } = Path.GetTempPath();
/// <summary>
/// Encoding web name used to persist encoding <see cref="Encoding"/>
/// </summary>
public string EncodingWebName { get; set; } = Encoding.Default.WebName;
/// <summary> /// <summary>
/// Encoding used for parsing stdout/stderr on ffmpeg and ffprobe processes /// Encoding used for parsing stdout/stderr on ffmpeg and ffprobe processes
/// </summary> /// </summary>
public Encoding Encoding { get; set; } = Encoding.Default; [JsonIgnore]
public Encoding Encoding
{
get => Encoding.GetEncoding(EncodingWebName);
set => EncodingWebName = value?.WebName ?? Encoding.Default.WebName;
}
/// <summary> /// <summary>
/// The log level to use when calling of the ffmpeg executable. /// The log level to use when calling of the ffmpeg executable.