aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-11 13:21:20 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-11 13:21:20 -0400
commit8f643ad7718baf1d81d835df939ba6099fe5d9f6 (patch)
treeefdf79e9d821db212295dc85b5e81f3d98b1087e
parent8c08292c0892a8bb54135ae88e0b8d6f8286f97e (diff)
updated ffmpeg
-rw-r--r--MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj2
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130406.zip.REMOVED.git-id1
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id1
3 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index c70205841..a4c4fc614 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -255,7 +255,7 @@
<ItemGroup>
<EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" />
<EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" />
- <EmbeddedResource Include="MediaEncoder\ffmpeg20130406.zip" />
+ <EmbeddedResource Include="MediaEncoder\ffmpeg20130408.zip" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130406.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130406.zip.REMOVED.git-id
deleted file mode 100644
index e5c1d31ec..000000000
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130406.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-cfcda86903f2ec95f7b3e5c01cfbca20801c9685 \ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id
new file mode 100644
index 000000000..c1a4c08b1
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id
@@ -0,0 +1 @@
+13efb0e506699c6d90c23a7600b3556d91dd31a1 \ No newline at end of file