aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding
diff options
context:
space:
mode:
authorClaus Vium <cvium@users.noreply.github.com>2021-10-13 00:04:09 +0200
committerGitHub <noreply@github.com>2021-10-13 00:04:09 +0200
commit09f33d3b8726fe5cd52c6fe62291ca9787093e83 (patch)
treef941adfd4f851d445779be640dfe5c9175524241 /MediaBrowser.MediaEncoding
parent6ab412ed00f8274aa18d03692dbd03134bf91c46 (diff)
parent32f3d60a84a0e6e83ed0b00a1490e9fbd93a198d (diff)
Merge pull request #6558 from dmitrylyzo/ffmpeg-exitcode
Diffstat (limited to 'MediaBrowser.MediaEncoding')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs1
-rw-r--r--MediaBrowser.MediaEncoding/FfmpegException.cs39
-rw-r--r--MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs1
3 files changed, 2 insertions, 39 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 06fe95ce8..3dbbeda8a 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -12,6 +12,7 @@ using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using Jellyfin.Extensions.Json;
+using MediaBrowser.Common;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Configuration;
diff --git a/MediaBrowser.MediaEncoding/FfmpegException.cs b/MediaBrowser.MediaEncoding/FfmpegException.cs
deleted file mode 100644
index 1697fd33a..000000000
--- a/MediaBrowser.MediaEncoding/FfmpegException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-
-namespace MediaBrowser.MediaEncoding
-{
- /// <summary>
- /// Represents errors that occur during interaction with FFmpeg.
- /// </summary>
- public class FfmpegException : Exception
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="FfmpegException"/> class.
- /// </summary>
- public FfmpegException()
- {
- }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="FfmpegException"/> class with a specified error message.
- /// </summary>
- /// <param name="message">The message that describes the error.</param>
- public FfmpegException(string message) : base(message)
- {
- }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="FfmpegException"/> class with a specified error message and a
- /// reference to the inner exception that is the cause of this exception.
- /// </summary>
- /// <param name="message">The error message that explains the reason for the exception.</param>
- /// <param name="innerException">
- /// The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if
- /// no inner exception is specified.
- /// </param>
- public FfmpegException(string message, Exception innerException)
- : base(message, innerException)
- {
- }
- }
-}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index bfc17904c..2b2de2ff6 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -11,6 +11,7 @@ using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Common;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net;