updated ffmpeg

4 files changed, 11 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index a20fcc52e..d3dca5e69 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -232,7 +232,7 @@
   <ItemGroup>
     <EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" />
     <EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" />
-    <EmbeddedResource Include="MediaEncoder\ffmpeg20130801.zip" />
+    <EmbeddedResource Include="MediaEncoder\ffmpeg20130813.zip" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130801.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130801.zip.REMOVED.git-id
deleted file mode 100644
index 95171d37f..000000000
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130801.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-613e78d600f730f300664739857798de331ecdf7
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id
new file mode 100644
index 000000000..caa811f9d
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id
@@ -0,0 +1 @@
+b189be2ae05b04bad9162b441ca2b55873b8c42d
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs
index 7db8a5a6f..c9acc2172 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs
@@ -145,12 +145,18 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 {
                     if (reader.Read())
                     {
-                        return new ChapterInfo
+                        var chapter = new ChapterInfo
                         {
                             StartPositionTicks = reader.GetInt64(0),
-                            Name = reader.GetString(1),
-                            ImagePath = reader.GetString(2)
+                            Name = reader.GetString(1)
                         };
+
+                        if (!reader.IsDBNull(2))
+                        {
+                            chapter.ImagePath = reader.GetString(2);
+                        }
+
+                        return chapter;
                     }
                 }
                 return null;