updated ffmpeg

11 years ago · 33eb6bca88
parent cc403f2c2f
commit 33eb6bca88
4 changed files with 11 additions and 5 deletions
--- 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 />
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130801.zip.REMOVED.git-id
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130801.zip.REMOVED.git-id
@ -1 +0,0 @@
-613e78d600f730f300664739857798de331ecdf7
--- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id
@ -0,0 +1 @@
+b189be2ae05b04bad9162b441ca2b55873b8c42d
--- 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;