Merge remote-tracking branch 'upstream/master' into no-scaling

2026-03-23 02:27:17 +00:00 · 2020-11-19 23:18:25 +01:00
parent 2deda0437d b5ff91c281
commit e21e00cad5
154 changed files with 2334 additions and 2829 deletions
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -25,6 +25,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
            "ac3",
            "aac",
            "mp3",
+            "flac",
            "h264_qsv",
            "hevc_qsv",
            "mpeg2_qsv",
@@ -71,6 +72,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
            "libmp3lame",
            "libopus",
            "libvorbis",
+            "flac",
            "srt",
            "h264_amf",
            "hevc_amf",