CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-03 22:40:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into tonemap-overlay

Browse source
This commit is contained in:
Claus Vium 2021-08-30 20:02:31 +02:00 • committed by GitHub
commit ae031fdd28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
158 changed files with 2644 additions and 2112 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View file

@ -7,7 +7,6 @@ using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
@ -16,9 +15,7 @@ using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Configuration;
namespace MediaBrowser.Controller.MediaEncoding
{