updated ffmpeg

11 years ago · a11fa2e064
parent 98e7eeeff9
commit a11fa2e064
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
@ -232,7 +232,7 @@
    <EmbeddedResource Include="MediaEncoder\readme.txt" />
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Include="MediaEncoder\ffmpeg20130813.zip" />
+    <EmbeddedResource Include="MediaEncoder\ffmpeg20130904.zip" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id
@ -1 +0,0 @@
-b189be2ae05b04bad9162b441ca2b55873b8c42d
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130904.zip.REMOVED.git-id
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130904.zip.REMOVED.git-id
@ -0,0 +1 @@
+3496b2cde22e7c4cb56b480dd2da637167d51e78