diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-01-16 15:26:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 15:26:46 +0900 |
| commit | 4aa0b940e314214df604369c6b9b565492896c59 (patch) | |
| tree | 0fb40c39f42ff9b84e4229a312c74158d6da8f89 /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 884c3e561425b09c9be9d614fa086c479834cad6 (diff) | |
| parent | 2c10891b66bf5963d2bfca34b704607a3bc0de85 (diff) | |
Merge pull request #2251 from nyanmisaka/master
add support for AMD AMF hardware encoding on Windows & Linux
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 |