alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-28 14:08:22 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Luke Pulverenti
2016-01-19 14:46:59 -05:00
parent 29e03046ed
commit 76bfde2675
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@@ -492,11 +492,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (isAudio)
{
//if (imageStreamIndex.HasValue && imageStreamIndex.Value > 0)
//{
// // It seems for audio files we need to subtract 1 (for the audio stream??)
// imageStreamIndex = imageStreamIndex.Value - 1;
//}
if (imageStreamIndex.HasValue && imageStreamIndex.Value > 0)
{
// It seems for audio files we need to subtract 1 (for the audio stream??)
imageStreamIndex = imageStreamIndex.Value - 1;
}
}
else
{