CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-07 00:41:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge media encoder changes from dev

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-04 21:49:30 -05:00
parent e71a3c516a
commit 475c54e283
3 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
View file

@ -505,7 +505,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
return "libx264";
}
if (string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase))
if (string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase) || string.Equals(codec, "hevc", StringComparison.OrdinalIgnoreCase))
{
return "libx265";
}