mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-05-13 04:06:31 +01:00
Merge pull request #16290 from benbenmoss/fix/io-excemption-from-strm
Some checks failed
CodeQL / Analyze (csharp) (push) Has been cancelled
Tests / run-tests (macos-latest) (push) Has been cancelled
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Tests / run-tests (windows-latest) (push) Has been cancelled
OpenAPI Publish / OpenAPI - Publish Artifact (push) Has been cancelled
OpenAPI Publish / OpenAPI - Publish Unstable Spec (push) Has been cancelled
OpenAPI Publish / OpenAPI - Publish Stable Spec (push) Has been cancelled
Project Automation / Project board (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
Stale PR Check / Check PRs with merge conflicts (push) Has been cancelled
Some checks failed
CodeQL / Analyze (csharp) (push) Has been cancelled
Tests / run-tests (macos-latest) (push) Has been cancelled
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Tests / run-tests (windows-latest) (push) Has been cancelled
OpenAPI Publish / OpenAPI - Publish Artifact (push) Has been cancelled
OpenAPI Publish / OpenAPI - Publish Unstable Spec (push) Has been cancelled
OpenAPI Publish / OpenAPI - Publish Stable Spec (push) Has been cancelled
Project Automation / Project board (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
Stale PR Check / Check PRs with merge conflicts (push) Has been cancelled
IOException with STRM HTTP URLs
This commit is contained in:
@@ -1708,6 +1708,13 @@ namespace MediaBrowser.MediaEncoding.Probing
|
||||
return;
|
||||
}
|
||||
|
||||
// Skip timestamp extration for remote resource (http, rtsp, etc.)
|
||||
// as they cannot be opened with FileStream
|
||||
if (video.Protocol != MediaProtocol.File)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!string.Equals(video.Container, "mpeg2ts", StringComparison.OrdinalIgnoreCase)
|
||||
&& !string.Equals(video.Container, "m2ts", StringComparison.OrdinalIgnoreCase)
|
||||
&& !string.Equals(video.Container, "ts", StringComparison.OrdinalIgnoreCase))
|
||||
|
||||
Reference in New Issue
Block a user