From 774b4a0d3fa02b66a17dfd605733f85602a6fbd2 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Sat, 1 Oct 2022 00:56:46 -0400 Subject: [PATCH] Revert "Merge pull request #8298 from lomion0815/fix-data-stream" This reverts commit 848ea703bca4a37e4020f48992c4b1f481f62623, reversing changes made to af877063795469ac3d94d356b2787e296606f571. --- .../Probing/ProbeResultNormalizer.cs | 5 ----- MediaBrowser.Model/Entities/MediaStreamType.cs | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs index 0f6c994efc..74d7341e91 100644 --- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs +++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs @@ -863,13 +863,8 @@ namespace MediaBrowser.MediaEncoding.Probing } } } - else if (string.Equals(streamInfo.CodecType, "data", StringComparison.OrdinalIgnoreCase)) - { - stream.Type = MediaStreamType.Data; - } else { - _logger.LogError("Codec Type {CodecType} unknown. The stream (index: {Index}) will be ignored. Warning: Subsequential streams will have a wrong stream specifier!", streamInfo.CodecType, streamInfo.Index); return null; } diff --git a/MediaBrowser.Model/Entities/MediaStreamType.cs b/MediaBrowser.Model/Entities/MediaStreamType.cs index 83751a6a7d..e09aaf6d05 100644 --- a/MediaBrowser.Model/Entities/MediaStreamType.cs +++ b/MediaBrowser.Model/Entities/MediaStreamType.cs @@ -23,11 +23,6 @@ namespace MediaBrowser.Model.Entities /// /// The embedded image. /// - EmbeddedImage, - - /// - /// The data. - /// - Data + EmbeddedImage } }