fix merge conflicts

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
             {

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;
             }
         }