updated ffmpeg

12 years ago · 2d7c0ab29c
parent 60e0f4d955
commit 2d7c0ab29c
3 changed files with 2 additions and 2 deletions
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@ -200,9 +200,9 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Include="MediaInfo\ffmpeg20130327.zip" />
    <EmbeddedResource Include="MediaInfo\fonts\ARIALUNI.TTF" />
    <EmbeddedResource Include="MediaInfo\fonts\fonts.conf" />
+    <EmbeddedResource Include="MediaInfo\ffmpeg20130405.zip" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
--- a/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id
+++ b/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id
@ -1 +0,0 @@
-5e4750e9819a6763ee6a30a36b675ffa846a710b
--- a/MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id
+++ b/MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id
@ -0,0 +1 @@
+33054d71c54e6c262d24d16153c05d45718aeb26