diff options
| author | artiume <siderite@gmail.com> | 2020-01-26 09:33:31 -0500 |
|---|---|---|
| committer | artiume <siderite@gmail.com> | 2020-01-26 09:33:31 -0500 |
| commit | 918df5e352889a5d990e2a9feb1e838f3acc9a39 (patch) | |
| tree | 8c029e97e7e55ce5780709f047710da0807668cb /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 0cbae4a06d49acccfd7a757039f7f6725cdc53a5 (diff) | |
| parent | e58aa57ed75417f8eb80c55fb1b782153f924fb8 (diff) | |
Merge remote-tracking branch 'jellyfin/master'
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 1feca0ec9..f5decdc0d 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -55,7 +55,9 @@ namespace MediaBrowser.MediaEncoding.Encoder "h264_vaapi", "hevc_vaapi", "h264_v4l2m2m", - "ac3" + "ac3", + "h264_amf", + "hevc_amf" }; // Try and use the individual library versions to determine a FFmpeg version |