diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-23 13:16:23 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-23 13:16:23 -0400 |
| commit | 1c2be7ba67d2cb5b98155e839983a6666f92961d (patch) | |
| tree | 8f58516e3e9cce23bd5233f4164a276a1bc3b957 | |
| parent | db0264e80fa84aba2263f22b799e5a9f4359b490 (diff) | |
fixes #429 - extract ffmpeg
3 files changed, 0 insertions, 10 deletions
diff --git a/MediaBrowser.ServerApplication/Implementations/ffmpeg20130904.zip.REMOVED.git-id b/MediaBrowser.ServerApplication/Implementations/ffmpeg20130904.zip.REMOVED.git-id deleted file mode 100644 index e99d115a4..000000000 --- a/MediaBrowser.ServerApplication/Implementations/ffmpeg20130904.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3496b2cde22e7c4cb56b480dd2da637167d51e78
\ No newline at end of file diff --git a/MediaBrowser.ServerApplication/Implementations/readme.txt b/MediaBrowser.ServerApplication/Implementations/readme.txt deleted file mode 100644 index b32dd9aec..000000000 --- a/MediaBrowser.ServerApplication/Implementations/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -This is the 32-bit static build of ffmpeg, located at: - -http://ffmpeg.zeranoe.com/builds/ - -The zip file contains both ffmpeg and ffprobe, and is suffixed with the date of the build.
\ No newline at end of file diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 965e9f873..d76fa25f4 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -281,7 +281,6 @@ <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> <None Include="app.manifest" /> - <EmbeddedResource Include="Implementations\ffmpeg20130904.zip" /> <None Include="packages.config" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> @@ -393,9 +392,6 @@ <ItemGroup> <Resource Include="Resources\Images\mb3logo800.png" /> </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Implementations\readme.txt" /> - </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> <PostBuildEvent>if $(ConfigurationName) == Release ( |