diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-12-05 17:49:15 +0100 |
|---|---|---|
| committer | Bond-009 <bond.009@outlook.com> | 2019-12-05 17:49:15 +0100 |
| commit | 5f6bca8aeb23064a2d81c25d72ae317364959232 (patch) | |
| tree | 832d85b6ed00f61394b4b9863fda8ea0b8a1490e /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | a6f883345f1941bf99db1667e84c1caf0b370479 (diff) | |
| parent | e05c02263a1cd58be0ec43e2057b2a6025c47758 (diff) | |
Merge remote-tracking branch 'upstream/master' into baseurl
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 3620abfee..1feca0ec9 100644 --- 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" }; |