diff options
| author | Cody Robibero <cody@robibe.ro> | 2022-06-13 16:27:45 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2022-06-14 19:32:09 -0400 |
| commit | 9c5d30c2174ad1e31b3143de164d1557adb32700 (patch) | |
| tree | c43a0f37785a920228f1525711760718b2c31ffc /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | db8047136df68b6fd5e05acd8837bc47d97c7fd9 (diff) | |
Merge pull request #7925 from nyanmisaka/remove-mpeg4-amf
(cherry picked from commit b295b0478c3bb8dd1b9d9ab7f15e7326c3eda2fe)
Signed-off-by: crobibero <cody@robibe.ro>
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 07a20baa0..1755b872f 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -4686,11 +4686,6 @@ namespace MediaBrowser.Controller.MediaEncoding { return GetHwaccelType(state, options, "vc1", bitDepth, hwSurface); } - - if (string.Equals("mpeg4", videoStream.Codec, StringComparison.OrdinalIgnoreCase)) - { - return GetHwaccelType(state, options, "mpeg4", bitDepth, hwSurface); - } } if (is8_10bitSwFormatsAmf) |