Backport pull request #11857 from jellyfin/release-10.9.z

Fix ffprobe -user_agent parameter

Original-merge: d0336cd67e

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
pull/11877/head
gnattu 8 months ago committed by Joshua M. Boniface
parent b123f7ffcd
commit 8424ff5b61

@ -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)

@ -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);
} }
} }
} }

Loading…
Cancel
Save