aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-09-05 17:36:47 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-09-05 17:36:47 -0400
commita11fa2e0645f2a44d44ef46d004777c8bd4378c1 (patch)
treeeb6a54e474baf51c17a93f6ff1f88f62cd9ad3d6
parent98e7eeeff933d6f5ba18daecb3931337523dc01b (diff)
updated ffmpeg
-rw-r--r--MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj2
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id1
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130904.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 c121c0e1a..7bae2bd85 100644
--- 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>
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id
deleted file mode 100644
index caa811f9d..000000000
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-b189be2ae05b04bad9162b441ca2b55873b8c42d \ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130904.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130904.zip.REMOVED.git-id
new file mode 100644
index 000000000..e99d115a4
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130904.zip.REMOVED.git-id
@@ -0,0 +1 @@
+3496b2cde22e7c4cb56b480dd2da637167d51e78 \ No newline at end of file