diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2019-06-20 16:55:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 16:55:09 -0700 |
| commit | dbc2cda9d41eb9dca6f635f3498c14a4e09a84e6 (patch) | |
| tree | acd93f12bb845368817ca8cf4aeed0d2d47ac94b /MediaBrowser.MediaEncoding/Encoder | |
| parent | 04784b4e4301bb150e8af5d66154e969e71d9efc (diff) | |
| parent | 65fa61a6369bef8c7aa7cc2b9e6be383a2de3cb6 (diff) | |
Merge pull request #1369 from teacupx/master
Enable Exynos MFC encoder and fix transcoding bitrate control
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 3eed891cb..b00350875 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -207,6 +207,7 @@ namespace MediaBrowser.MediaEncoding.Encoder "hevc_omx", "h264_vaapi", "hevc_vaapi", + "h264_v4l2m2m", "ac3" }; |