mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
updated ffmpeg
This commit is contained in:
parent
cc403f2c2f
commit
33eb6bca88
@ -232,7 +232,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" />
|
<EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" />
|
||||||
<EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" />
|
<EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" />
|
||||||
<EmbeddedResource Include="MediaEncoder\ffmpeg20130801.zip" />
|
<EmbeddedResource Include="MediaEncoder\ffmpeg20130813.zip" />
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
|
@ -1 +0,0 @@
|
|||||||
613e78d600f730f300664739857798de331ecdf7
|
|
@ -0,0 +1 @@
|
|||||||
|
b189be2ae05b04bad9162b441ca2b55873b8c42d
|
@ -145,12 +145,18 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
|||||||
{
|
{
|
||||||
if (reader.Read())
|
if (reader.Read())
|
||||||
{
|
{
|
||||||
return new ChapterInfo
|
var chapter = new ChapterInfo
|
||||||
{
|
{
|
||||||
StartPositionTicks = reader.GetInt64(0),
|
StartPositionTicks = reader.GetInt64(0),
|
||||||
Name = reader.GetString(1),
|
Name = reader.GetString(1)
|
||||||
ImagePath = reader.GetString(2)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (!reader.IsDBNull(2))
|
||||||
|
{
|
||||||
|
chapter.ImagePath = reader.GetString(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
return chapter;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
Loading…
Reference in New Issue
Block a user