diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-19 14:46:59 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-19 14:46:59 -0500 |
| commit | 76bfde2675f832ad389f8d83148cddb66c214f0e (patch) | |
| tree | 14a8cf830c6f16922bbfae2cd11507ab56214e6d | |
| parent | 29e03046edf33cf3048c771bd056322d463dcd21 (diff) | |
fix merge conflicts
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mono/Native/BaseMonoApp.cs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index d5645ce0e..ba0790bf3 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -492,11 +492,11 @@ namespace MediaBrowser.MediaEncoding.Encoder if (isAudio) { - //if (imageStreamIndex.HasValue && imageStreamIndex.Value > 0) - //{ - // // It seems for audio files we need to subtract 1 (for the audio stream??) - // imageStreamIndex = imageStreamIndex.Value - 1; - //} + if (imageStreamIndex.HasValue && imageStreamIndex.Value > 0) + { + // It seems for audio files we need to subtract 1 (for the audio stream??) + imageStreamIndex = imageStreamIndex.Value - 1; + } } else { diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs index 8f3006e11..31d4592c8 100644 --- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs @@ -119,7 +119,7 @@ namespace MediaBrowser.Server.Mono.Native { get { - return Environment.OperatingSystem == Startup.Common.OperatingSystem.Linux; + return Environment.OperatingSystem != Startup.Common.OperatingSystem.Osx; } } |