alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-01 03:42:51 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update translations

Browse Source
This commit is contained in:
Luke Pulverenti
2014-06-23 12:05:19 -04:00
parent eba1845f2a
commit 0727475abf
105 changed files with 1699 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@@ -1221,7 +1221,7 @@ namespace MediaBrowser.Api.Playback
{
if (videoRequest != null)
{
videoRequest.MaxFramerate = double.Parse(val, UsCulture);
videoRequest.MaxFramerate = float.Parse(val, UsCulture);
}
}
else if (i == 12)
@@ -1509,8 +1509,6 @@ namespace MediaBrowser.Api.Playback
state.OutputContainer = (container ?? string.Empty).TrimStart('.');
ApplyDeviceProfileSettings(state);
state.OutputAudioBitrate = GetAudioBitrateParam(state.Request, state.AudioStream);
state.OutputAudioSampleRate = request.AudioSampleRate;
@@ -1522,7 +1520,12 @@ namespace MediaBrowser.Api.Playback
{
state.OutputVideoCodec = GetVideoCodec(videoRequest);
state.OutputVideoBitrate = GetVideoBitrateParamValue(state.VideoRequest, state.VideoStream);
}
ApplyDeviceProfileSettings(state);
if (videoRequest != null)
{
if (state.VideoStream != null && CanStreamCopyVideo(videoRequest, state.VideoStream))
{
state.OutputVideoCodec = "copy";
@@ -1952,21 +1955,6 @@ namespace MediaBrowser.Api.Playback
inputModifier += " -fflags genpts";
}
if (!string.IsNullOrEmpty(state.InputFormat))
{
inputModifier += " -f " + state.InputFormat;
}
if (!string.IsNullOrEmpty(state.InputVideoCodec))
{
inputModifier += " -vcodec " + state.InputVideoCodec;
}
if (!string.IsNullOrEmpty(state.InputAudioCodec))
{
inputModifier += " -acodec " + state.InputAudioCodec;
}
if (!string.IsNullOrEmpty(state.InputAudioSync))
{
inputModifier += " -async " + state.InputAudioSync;