updated ffmpeg

12 years ago · 1fc15d543f
parent f64b06f76a
commit 1fc15d543f
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
@ -277,7 +277,7 @@
  <ItemGroup>
    <EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" />
    <EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" />
-    <EmbeddedResource Include="MediaEncoder\ffmpeg20130611.zip" />
+    <EmbeddedResource Include="MediaEncoder\ffmpeg20130614.zip" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup />
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id
@ -1 +0,0 @@
-2c960e5beead36465770c7b4fb7d4cd73b3258d3
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id
@ -0,0 +1 @@
+f120bc09bb90fc9ec93a1d1befde434e1c090138