diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-14 08:42:43 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-14 08:42:43 -0400 |
| commit | 1fc15d543f0eb2d92ed85f2e47342a275bf2bd83 (patch) | |
| tree | 6475fda54102cfddd7d0a2749f8b90959757ac72 | |
| parent | f64b06f76a376243a15fc01d393afe6918d3bf93 (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 a20c6bdff..a006161d4 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -277,7 +277,7 @@ <ItemGroup> <EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" /> <EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" /> - <EmbeddedResource Include="MediaEncoder\ffmpeg20130611.zip" /> + <EmbeddedResource Include="MediaEncoder\ffmpeg20130614.zip" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup /> diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id deleted file mode 100644 index 1d348d1cf..000000000 --- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130611.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -2c960e5beead36465770c7b4fb7d4cd73b3258d3
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id new file mode 100644 index 000000000..82133fdc1 --- /dev/null +++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130614.zip.REMOVED.git-id @@ -0,0 +1 @@ +f120bc09bb90fc9ec93a1d1befde434e1c090138
\ No newline at end of file |