diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-29 00:32:16 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-29 00:32:16 -0500 |
| commit | 9edbc9ff8bb30785151fededf3452b28dd310250 (patch) | |
| tree | 88574f2edcb792824c2d700ed946c4c8942f3a09 | |
| parent | feff0c711f5854cf9e7bdb3ed8bc760a44a2a173 (diff) | |
| parent | 532296a9aa5b2afdb69825c995b1e6a0fd9ff7a5 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/VideoService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index 99772d2ec..583082500 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -94,7 +94,7 @@ namespace MediaBrowser.Api.Playback.Hls audioSampleRate = state.Request.AudioSampleRate.Value + ":"; } - args += string.Format(" -af \"adelay=1,aresample={0}async=1000{1}\"", audioSampleRate, volParam); + args += string.Format(" -af \"adelay=1,aresample={0}async=1{1}\"", audioSampleRate, volParam); return args; } diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index 31dbcaafb..f4e4019f6 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -250,7 +250,7 @@ namespace MediaBrowser.Api.Playback.Progressive AudioSampleRate = state.Request.AudioSampleRate.Value + ":"; } - args += string.Format(" -af \"aresample={0}async=1000{1}\"", AudioSampleRate, volParam); + args += string.Format(" -af \"aresample={0}async=1{1}\"", AudioSampleRate, volParam); return args; } |