mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #4501] [MERGED] Don't scale extracted images and ffmpeg improvements #10112
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/jellyfin/jellyfin/pull/4501
Author: @ferferga
Created: 11/17/2020
Status: ✅ Merged
Merged: 11/20/2020
Merged by: @cvium
Base:
master← Head:no-scaling📝 Commits (6)
a6ad36bDon't scale images extracted by ffmpegd7cdaeeUse all system cores when threads are set to auto or bigger than the amount of system's cores94cae4fSpecify threads to ffmpeg properly38c3b6fFix build and thread detection logic2deda04Review suggestionse21e00cMerge remote-tracking branch 'upstream/master' into no-scaling📊 Changes
6 files changed (+40 additions, -26 deletions)
View changed files
📝
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs(+1 -1)📝
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs(+10 -3)📝
Jellyfin.Api/Controllers/DynamicHlsController.cs(+1 -1)📝
Jellyfin.Api/Controllers/VideoHlsController.cs(+1 -1)📝
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs(+9 -4)📝
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs(+18 -16)📄 Description
Changes
Issues
Fixes #2345
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.