Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11857 from gnattu/fix-ffprobe-useragent

Browse Source 
Fix ffprobe -user_agent parameter
This commit is contained in:
Bond-009 2024-05-29 10:00:36 +02:00 committed by GitHub
commit d0336cd67e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -456,9 +456,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
extraArgs += " -probesize " + ffmpegProbeSize; extraArgs += " -probesize " + ffmpegProbeSize;
} }
if (request.MediaSource.RequiredHttpHeaders.TryGetValue("user_agent", out var userAgent)) if (request.MediaSource.RequiredHttpHeaders.TryGetValue("User-Agent", out var userAgent))
{ {
extraArgs += " -user_agent " + userAgent; extraArgs += $" -user_agent \"{userAgent}\"";
} }
if (request.MediaSource.Protocol == MediaProtocol.Rtsp) if (request.MediaSource.Protocol == MediaProtocol.Rtsp)

4
tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeExternalSourcesTests.cs
View File

@ -35,7 +35,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
Protocol = MediaProtocol.Http, Protocol = MediaProtocol.Http,
RequiredHttpHeaders = new Dictionary<string, string>() RequiredHttpHeaders = new Dictionary<string, string>()
{ {
{ "user_agent", userAgent }, { "User-Agent", userAgent },
} }
}, },
ExtractChapters = false, ExtractChapters = false,
@ -44,7 +44,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
var extraArg = encoder.GetExtraArguments(req); var extraArg = encoder.GetExtraArguments(req);
Assert.Contains(userAgent, extraArg, StringComparison.InvariantCulture); Assert.Contains($"-user_agent \"{userAgent}\"", extraArg, StringComparison.InvariantCulture);
} }
} }
} }