From 1c2be7ba67d2cb5b98155e839983a6666f92961d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 23 Sep 2013 13:16:23 -0400 Subject: [PATCH] fixes #429 - extract ffmpeg --- .../Implementations/ffmpeg20130904.zip.REMOVED.git-id | 1 - MediaBrowser.ServerApplication/Implementations/readme.txt | 5 ----- .../MediaBrowser.ServerApplication.csproj | 4 ---- 3 files changed, 10 deletions(-) delete mode 100644 MediaBrowser.ServerApplication/Implementations/ffmpeg20130904.zip.REMOVED.git-id delete mode 100644 MediaBrowser.ServerApplication/Implementations/readme.txt 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 e99d115a48..0000000000 --- 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 b32dd9aec0..0000000000 --- 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 965e9f8737..d76fa25f4d 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -281,7 +281,6 @@ Resources.Designer.cs - SettingsSingleFileGenerator @@ -393,9 +392,6 @@ - - - if $(ConfigurationName) == Release (