Merge pull request #1242 from MediaBrowser/master

merge from master
This commit is contained in:
Luke 2015-10-30 13:06:39 -04:00
commit 967a36d147
2 changed files with 7 additions and 2 deletions

View File

@ -126,6 +126,11 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
{
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-32bit-static.7z"
};
case Architecture.Arm:
return new[]
{
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-arm.7z"
};
}
break;
}