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

Always set ffmpeg flag +genpts when video stream is being copied

Browse Source
This commit is contained in:
Lynxy 2019-02-21 19:50:57 -05:00
parent e7e7d96f51
commit 9b39404b9a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -1904,7 +1904,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
flags.Add("+ignidx"); flags.Add("+ignidx");
} }
if (state.GenPtsInput) if (state.GenPtsInput || string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
{ {
flags.Add("+genpts"); flags.Add("+genpts");
} }
@ -2436,6 +2436,8 @@ namespace MediaBrowser.Controller.MediaEncoding
if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase)) if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase))
{ {
args += " -flags -global_header -fflags +genpts";
if (state.VideoStream != null && IsH264(state.VideoStream) && if (state.VideoStream != null && IsH264(state.VideoStream) &&
string.Equals(state.OutputContainer, "ts", StringComparison.OrdinalIgnoreCase) && string.Equals(state.OutputContainer, "ts", StringComparison.OrdinalIgnoreCase) &&
!string.Equals(state.VideoStream.NalLengthSize, "0", StringComparison.OrdinalIgnoreCase)) !string.Equals(state.VideoStream.NalLengthSize, "0", StringComparison.OrdinalIgnoreCase))
@ -2447,11 +2449,6 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
args += " -copyts -avoid_negative_ts disabled -start_at_zero"; args += " -copyts -avoid_negative_ts disabled -start_at_zero";
} }
if (!state.RunTimeTicks.HasValue)
{
args += " -flags -global_header -fflags +genpts";
}
} }
else else
{ {