Merge pull request #1346 from MediaBrowser/master

merge from master

MediaBrowser.Server.Mac/MediaBrowser.MediaInfo.dll.config

@@ -1,3 +0,0 @@
-<configuration>
-  <dllmap dll="MediaInfo" target="libmediainfo.dylib" os="osx"/>
-</configuration>

MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs

@@ -111,6 +111,16 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
 
             DeleteOlderFolders(Path.GetDirectoryName(versionedDirectoryPath), excludeFromDeletions);
 
+            // Allow just one of these to be overridden, if desired.
+            if (!string.IsNullOrWhiteSpace(customffMpegPath))
+            {
+                info.EncoderPath = customffMpegPath;
+            }
+            if (!string.IsNullOrWhiteSpace(customffProbePath))
+            {
+                info.EncoderPath = customffProbePath;
+            }
+
             return info;
         }
 

MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs

@@ -90,12 +90,12 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
                 "libx265",
                 "mpeg4",
                 "msmpeg4",
-                "libvpx",
+                //"libvpx",
                 //"libvpx-vp9",
                 "aac",
                 "ac3",
                 "libmp3lame",
-                "libvorbis",
+                //"libvorbis",
                 "srt"
             };
 

MediaBrowser.WebDashboard/Api/PackageCreator.cs

@@ -434,11 +434,18 @@ namespace MediaBrowser.WebDashboard.Api
 
             var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + version : string.Empty;
 
-            var files = new List<string>
+            var files = new List<string>();
+
+            if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
             {
-                "bower_components/requirejs/require.js" + versionString,
-                "scripts/site.js" + versionString
-            };
+                files.Add("bower_components/requirejs/require.js");
+            }
+            else
+            {
+                files.Add("bower_components" + version + "/requirejs/require.js");
+            }
+
+            files.Add("scripts/site.js" + versionString);
 
             if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
             {