Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

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

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