Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -201,7 +201,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="MediaInfo\ffmpeg20130312.zip" />
+    <EmbeddedResource Include="MediaInfo\ffmpeg20130310.zip" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

MediaBrowser.Controller/MediaInfo/FFMpegManager.cs

@@ -137,15 +137,15 @@ namespace MediaBrowser.Controller.MediaInfo
         /// <summary>
         /// The FF probe resource pool count
         /// </summary>
-        private const int FFProbeResourcePoolCount = 4;
+        private const int FFProbeResourcePoolCount = 3;
         /// <summary>
         /// The audio image resource pool count
         /// </summary>
-        private const int AudioImageResourcePoolCount = 4;
+        private const int AudioImageResourcePoolCount = 3;
         /// <summary>
         /// The video image resource pool count
         /// </summary>
-        private const int VideoImageResourcePoolCount = 2;
+        private const int VideoImageResourcePoolCount = 1;
 
         /// <summary>
         /// The FF probe resource pool

MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id

@@ -0,0 +1 @@
+8e635e6882f3482f3cabbfbf42b76e2c9d24678a

MediaBrowser.Controller/MediaInfo/ffmpeg20130312.zip.REMOVED.git-id

@@ -1 +0,0 @@
-629771e1793534eea1b867e8333f22a829acc35f