github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8649 from jellyfin/revert-8480-revert-data-streams

Browse source
This commit is contained in:
Joshua M. Boniface 2022-10-31 12:55:56 -04:00 • committed by GitHub
commit 84c03a2d93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View file

@ -863,8 +863,13 @@ namespace MediaBrowser.MediaEncoding.Probing
} }
} }
} }
else if (string.Equals(streamInfo.CodecType, "data", StringComparison.OrdinalIgnoreCase))
{
stream.Type = MediaStreamType.Data;
}
else 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; return null;
} }

7
MediaBrowser.Model/Entities/MediaStreamType.cs
View file

@ -23,6 +23,11 @@ namespace MediaBrowser.Model.Entities
/// <summary> /// <summary>
/// The embedded image. /// The embedded image.
/// </summary> /// </summary>
EmbeddedImage EmbeddedImage,
/// <summary>
/// The data.
/// </summary>
Data
} }
} }