Merge branch 'master' into mediaencoding

2026-01-29 14:38:04 +00:00 · 2019-12-10 23:00:59 +01:00
parent c6d48f51f6 67922dff50
commit 0bf8bfbb0c
258 changed files with 3301 additions and 1673 deletions
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -18,7 +18,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
            "h264_qsv",
            "hevc_qsv",
            "mpeg2_qsv",
+            "mpeg2_mmal",
+            "mpeg4_mmal",
            "vc1_qsv",
+            "vc1_mmal",
            "h264_cuvid",
            "hevc_cuvid",
            "dts",
@@ -26,6 +29,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
            "aac",
            "mp3",
            "h264",
+            "h264_mmal",
            "hevc"
        };