From 95b1bfb0de05ccd53da77fce499e4f208d3a9fa3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 14 Apr 2013 16:47:09 -0400
Subject: fixed people images being occasionally incorrect

---
 MediaBrowser.Server.Implementations/Providers/ProviderManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
index ff7222e7c1..58bb232a25 100644
--- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
@@ -237,7 +237,7 @@ namespace MediaBrowser.Server.Implementations.Providers
             }
             catch (OperationCanceledException ex)
             {
-                _logger.Debug("{0} cancelled for {1}", provider.GetType().Name, item.Name);
+                _logger.Debug("{0} canceled for {1}", provider.GetType().Name, item.Name);
 
                 // If the outer cancellation token is the one that caused the cancellation, throw it
                 if (cancellationToken.IsCancellationRequested && ex.CancellationToken == cancellationToken)
-- 
cgit v1.2.3


From 6138a7540bc25d6c1173bcd0f9fd2826ab84462a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 14 Apr 2013 19:14:01 -0400
Subject: updated ffmpeg

---
 .../MediaBrowser.Server.Implementations.csproj                          | 2 +-
 .../MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id                      | 1 -
 .../MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id                      | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id
 create mode 100644 MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index ba79ff5d59..66ec69f08f 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -256,7 +256,7 @@
   <ItemGroup>
     <EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" />
     <EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" />
-    <EmbeddedResource Include="MediaEncoder\ffmpeg20130408.zip" />
+    <EmbeddedResource Include="MediaEncoder\ffmpeg20130412.zip" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id
deleted file mode 100644
index c1a4c08b1b..0000000000
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-13efb0e506699c6d90c23a7600b3556d91dd31a1
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id
new file mode 100644
index 0000000000..71f2b701c6
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id
@@ -0,0 +1 @@
+1b75cc4abcfd185b6db07bbe433d010f947d50ae
\ No newline at end of file
-- 
cgit v1.2.3