浏览代码

update nvenc

Luke Pulverenti 8 年之前
父节点
当前提交
b28857feea

+ 0 - 1
MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -536,7 +536,6 @@ namespace MediaBrowser.Api.Playback
 
 
             if (!string.Equals(videoEncoder, "h264_omx", StringComparison.OrdinalIgnoreCase) &&
             if (!string.Equals(videoEncoder, "h264_omx", StringComparison.OrdinalIgnoreCase) &&
                 !string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) &&
                 !string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) &&
-                !string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase) &&
                 !string.Equals(videoEncoder, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
                 !string.Equals(videoEncoder, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
             {
             {
                 param = "-pix_fmt yuv420p " + param;
                 param = "-pix_fmt yuv420p " + param;

+ 0 - 1
MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs

@@ -775,7 +775,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
 
             if (!string.Equals(videoEncoder, "h264_omx", StringComparison.OrdinalIgnoreCase) &&
             if (!string.Equals(videoEncoder, "h264_omx", StringComparison.OrdinalIgnoreCase) &&
                 !string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) &&
                 !string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) &&
-                !string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase) &&
                 !string.Equals(videoEncoder, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
                 !string.Equals(videoEncoder, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
             {
             {
                 param = "-pix_fmt yuv420p " + param;
                 param = "-pix_fmt yuv420p " + param;