aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-03-19 14:59:46 -0400
committerGitHub <noreply@github.com>2017-03-19 14:59:46 -0400
commit22f8b2122d93c158b11fa56dce35e7c584d36789 (patch)
tree70cd8a375ebd2465f59968a1505508ab045c860d /MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
parent796096976f4af5b96b76812457faa2be5e657e18 (diff)
parent5b3b18b51dec8421d3ffc8c00874e22b026586b6 (diff)
Merge pull request #2534 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
index a4db8f3b8..05b3ca5fc 100644
--- a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
}
- protected override Task<string> GetCommandLineArguments(EncodingJob state)
+ protected override string GetCommandLineArguments(EncodingJob state)
{
var audioTranscodeParams = new List<string>();
@@ -78,7 +78,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
mapArgs,
metadata).Trim();
- return Task.FromResult(result);
+ return result;
}
protected override string GetOutputFileExtension(EncodingJob state)