aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-11 16:51:13 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-11 16:51:13 -0400
commitde2977cbf635e1d839f608117119d300c1ec9d89 (patch)
tree4761b5de611359630b562ee48cb27253b38a5256 /MediaBrowser.Server.Implementations
parent35d9b29c97379b40a6ba4554bd066cc2c25217ee (diff)
updated ffmpeg
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj2
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130523.zip.REMOVED.git-id1
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.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 509d46c74..1262e515e 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -278,7 +278,7 @@
<ItemGroup>
<EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" />
<EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" />
- <EmbeddedResource Include="MediaEncoder\ffmpeg20130523.zip" />
+ <EmbeddedResource Include="MediaEncoder\ffmpeg20130611.zip" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130523.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130523.zip.REMOVED.git-id
deleted file mode 100644
index 1bb538541..000000000
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130523.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-4d70588f0da1095974027f09130938f318f865c5 \ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id
new file mode 100644
index 000000000..1d348d1cf
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id
@@ -0,0 +1 @@
+2c960e5beead36465770c7b4fb7d4cd73b3258d3 \ No newline at end of file