aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Kernel.cs
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-12 00:03:19 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-12 00:03:19 -0400
commitbae04374e5423e969b2feb8dd3735b03c9eb5300 (patch)
treec4396a3538a1a222adf79cc97d858712f3f2c5f2 /MediaBrowser.Controller/Kernel.cs
parente0089349e1e526549b3c9c7ea749c04345d94156 (diff)
Fixed stdout/stderr deadlock issue that was causing ffmpeg to hang when working with large files.
Diffstat (limited to 'MediaBrowser.Controller/Kernel.cs')
-rw-r--r--MediaBrowser.Controller/Kernel.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 7841a2a5e..8eed678ba 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -5,7 +5,6 @@ using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
-using System.Threading.Tasks;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Kernel;
using MediaBrowser.Controller.Configuration;
@@ -15,8 +14,8 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Users;
using MediaBrowser.Model.Progress;
+using MediaBrowser.Model.Users;
namespace MediaBrowser.Controller
{