diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-03-12 15:28:46 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-03-12 15:28:46 -0400 |
| commit | 5954287cc377c312c73551d2e23239d418c2deab (patch) | |
| tree | c5600ad7138bb61e7e0e5d1019abcacbd12998cf | |
| parent | cc9f249afe4dd2b0ec96f59a748c67e301baca59 (diff) | |
| parent | 10879209ff5c8c40fe43c93bfcd92b87bcdccc58 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
4 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 1485b51f91..54ba9be55d 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/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> diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs index 36fab24bb1..4c4bc0873e 100644 --- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs +++ b/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 diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id new file mode 100644 index 0000000000..59c2e4db3a --- /dev/null +++ b/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id @@ -0,0 +1 @@ +8e635e6882f3482f3cabbfbf42b76e2c9d24678a
\ No newline at end of file diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130312.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130312.zip.REMOVED.git-id deleted file mode 100644 index ee5c292313..0000000000 --- a/MediaBrowser.Controller/MediaInfo/ffmpeg20130312.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -629771e1793534eea1b867e8333f22a829acc35f
\ No newline at end of file |