aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-05 01:07:12 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-05 01:07:12 -0400
commit2d7c0ab29c76392d5d8f6b72d27194ee38218643 (patch)
treef435395fec9448d44aba16b8ee690e86252db8d2
parent60e0f4d955b7707cb8845c324912c695a8693b16 (diff)
updated ffmpeg
-rw-r--r--MediaBrowser.Controller/MediaBrowser.Controller.csproj2
-rw-r--r--MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id1
-rw-r--r--MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id1
3 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 8c2895701..2e7a8a994 100644
--- 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>
diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id
deleted file mode 100644
index 7eeaacc0a..000000000
--- a/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-5e4750e9819a6763ee6a30a36b675ffa846a710b \ No newline at end of file
diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id
new file mode 100644
index 000000000..363d8552f
--- /dev/null
+++ b/MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id
@@ -0,0 +1 @@
+33054d71c54e6c262d24d16153c05d45718aeb26 \ No newline at end of file