Skip to content

Commit

Permalink
chore: bump system.text.json to v8.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaaybi committed Sep 18, 2024
1 parent eb221c3 commit d5a2e5c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion FFMpegCore/FFMpegCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<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>

</Project>
13 changes: 12 additions & 1 deletion FFMpegCore/FFOptions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Text;
using System.Text.Json.Serialization;
using FFMpegCore.Enums;

namespace FFMpegCore
Expand All @@ -20,10 +21,20 @@ public class FFOptions : ICloneable
/// </summary>
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>
/// Encoding used for parsing stdout/stderr on ffmpeg and ffprobe processes
/// </summary>
public Encoding Encoding { get; set; } = Encoding.Default;
[JsonIgnore]
public Encoding Encoding
{
get => Encoding.GetEncoding(EncodingWebName);
set => EncodingWebName = value?.WebName ?? Encoding.Default.WebName;
}

/// <summary>
/// The log level to use when calling of the ffmpeg executable.
Expand Down

0 comments on commit d5a2e5c

Please sign in to comment.