From 1fc15d543f0eb2d92ed85f2e47342a275bf2bd83 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 14 Jun 2013 08:42:43 -0400
Subject: [PATCH] updated ffmpeg

---
 .../MediaBrowser.Server.Implementations.csproj                  | 2 +-
 .../MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id              | 1 -
 .../MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id              | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id
 create mode 100644 MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id

diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index a20c6bdffb..a006161d49 100644
--- 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 />
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id
deleted file mode 100644
index 1d348d1cf5..0000000000
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-2c960e5beead36465770c7b4fb7d4cd73b3258d3
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id
new file mode 100644
index 0000000000..82133fdc16
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id
@@ -0,0 +1 @@
+f120bc09bb90fc9ec93a1d1befde434e1c090138
\ No newline at end of file