cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

updated ffmpeg

Browse Source
This commit is contained in:
Luke Pulverenti 2013-08-16 10:37:04 -04:00
parent cc403f2c2f
commit 33eb6bca88
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
View File

@ -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 />

1
MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130801.zip.REMOVED.git-id
View File

@ -1 +0,0 @@
613e78d600f730f300664739857798de331ecdf7

1
MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130813.zip.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
b189be2ae05b04bad9162b441ca2b55873b8c42d

12
MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs
View File

@ -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;