updated ffmpeg

12 years ago · 6138a7540b
parent 4260ebeb4e
commit 6138a7540b
3 changed files with 2 additions and 2 deletions
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@ -256,7 +256,7 @@
  <ItemGroup>
    <EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" />
    <EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" />
-    <EmbeddedResource Include="MediaEncoder\ffmpeg20130408.zip" />
+    <EmbeddedResource Include="MediaEncoder\ffmpeg20130412.zip" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup />
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id
@ -1 +0,0 @@
-13efb0e506699c6d90c23a7600b3556d91dd31a1
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id
@ -0,0 +1 @@
+1b75cc4abcfd185b6db07bbe433d010f947d50ae