diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-07 16:59:14 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-07 16:59:14 -0400 |
| commit | ad32d9947afa4e43f2e27778b8d21b8073013a0d (patch) | |
| tree | 1a14def53bca655d56e886b7caa829c5d8c4be2c | |
| parent | 597fedf95c58beaad0a937cd5c8f0a5d538ff74d (diff) | |
updated ffmpeg
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 81d2bbca4..ba2dda441 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -255,9 +255,9 @@ </Content> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="MediaEncoder\ffmpeg20130405.zip" /> <EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" /> <EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" /> + <EmbeddedResource Include="MediaEncoder\ffmpeg20130406.zip" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup /> diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130405.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130405.zip.REMOVED.git-id deleted file mode 100644 index 363d8552f..000000000 --- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130405.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -33054d71c54e6c262d24d16153c05d45718aeb26
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130406.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130406.zip.REMOVED.git-id new file mode 100644 index 000000000..e5c1d31ec --- /dev/null +++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130406.zip.REMOVED.git-id @@ -0,0 +1 @@ +cfcda86903f2ec95f7b3e5c01cfbca20801c9685
\ No newline at end of file |