aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/MediaEncoder
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-13 00:41:00 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-13 00:41:00 -0500
commitfdca3bd9c407aab9b22b6d09b6f393fa49be4f3d (patch)
tree766ade1e6bc8696157f6804cf529b68355eff16b /MediaBrowser.Server.Implementations/MediaEncoder
parente4f5a3f005a240b013194d6a54edce29fef91e11 (diff)
live tv updates
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder')
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
index 6f956ba20..b09ff623e 100644
--- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
@@ -249,11 +249,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
{
process.Kill();
}
- catch (InvalidOperationException ex1)
- {
- _logger.ErrorException("Error killing ffprobe", ex1);
- }
- catch (Win32Exception ex1)
+ catch (Exception ex1)
{
_logger.ErrorException("Error killing ffprobe", ex1);
}