aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-03-28 18:12:38 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-03-28 18:12:38 -0400
commit3d566d2f6b73f149ae0a5a953a4db33e2dd82ca1 (patch)
tree2e6a661b4aa0cac5d3bdbb28d949138143d7753d
parent3ff23530e77ba132fe635fbf20dadf568b6a2987 (diff)
remove -g from video params
-rw-r--r--MediaBrowser.Api/Playback/Hls/VideoHlsService.cs3
-rw-r--r--MediaBrowser.Api/Playback/Progressive/VideoService.cs6
2 files changed, 0 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index eb72f27d4..0e43794c3 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -151,9 +151,6 @@ namespace MediaBrowser.Api.Playback.Hls
args += string.Format(" -r {0}", framerate);
- // Needed to ensure segments stay under 10 seconds
- args += string.Format(" -g {0}", framerate);
-
args += " -vsync vfr";
if (!string.IsNullOrEmpty(state.VideoRequest.Profile))
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index b30a14ecc..e756bc314 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -87,12 +87,6 @@ namespace MediaBrowser.Api.Playback.Progressive
if (string.Equals(Path.GetExtension(outputPath), ".mp4", StringComparison.OrdinalIgnoreCase))
{
format = " -f mp4 -movflags frag_keyframe+empty_moov";
- var framerate = state.VideoRequest.Framerate ??
- state.VideoStream.AverageFrameRate ?? state.VideoStream.RealFrameRate ?? 23.976;
-
- framerate *= 2;
-
- keyFrame = " -g " + Math.Round(framerate);
}
return string.Format("{0} {1} -i {2}{3}{4} -threads 0 {5} {6} {7}{8} \"{9}\"",