fix merge conflicts

pull/1154/head
Luke Pulverenti 9 years ago
parent 29e03046ed
commit 76bfde2675

@ -492,11 +492,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (isAudio) if (isAudio)
{ {
//if (imageStreamIndex.HasValue && imageStreamIndex.Value > 0) if (imageStreamIndex.HasValue && imageStreamIndex.Value > 0)
//{ {
// // It seems for audio files we need to subtract 1 (for the audio stream??) // It seems for audio files we need to subtract 1 (for the audio stream??)
// imageStreamIndex = imageStreamIndex.Value - 1; imageStreamIndex = imageStreamIndex.Value - 1;
//} }
} }
else else
{ {

@ -119,7 +119,7 @@ namespace MediaBrowser.Server.Mono.Native
{ {
get get
{ {
return Environment.OperatingSystem == Startup.Common.OperatingSystem.Linux; return Environment.OperatingSystem != Startup.Common.OperatingSystem.Osx;
} }
} }

Loading…
Cancel
Save