starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-01 11:20:59 +03:00
Code Issues 822 Packages Projects Releases 10 Wiki Activity

[PR #613] [MERGED] Update MediaEncoding #8403

New Issue
Closed
opened 2026-02-07 05:43:33 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-07 05:43:33 +03:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/jellyfin/jellyfin/pull/613
Author: @MatMaul
Created: 1/18/2019
Status: ✅ Merged
Merged: 1/21/2019
Merged by: @andrewrabert

Base: dev ← Head: mediaencoding-dev

📝 Commits (3)

📊 Changes

6 files changed (+302 additions, -265 deletions)

View changed files

📝 MediaBrowser.Api/Playback/StreamRequest.cs (+0 -23)
📝 MediaBrowser.Api/Playback/StreamState.cs (+15 -77)
📝 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs (+195 -81)
📝 MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs (+52 -21)
📝 MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs (+29 -12)
📝 MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs (+11 -51)

📄 Description

Revert back to 197574f811 for MediaEncoding. This is the last commit including this code in this repo.

This perhaps fixes #482, not sure. The generated CLI for nvenc seems not completely compliant with the ffmpeg wiki so it's perhaps something else. I don't have the hw to test right now.

Remove some duplicate code that were causing warnings.

Cherrypick PRs #198 and #202.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/jellyfin/jellyfin/pull/613 **Author:** [@MatMaul](https://github.com/MatMaul) **Created:** 1/18/2019 **Status:** ✅ Merged **Merged:** 1/21/2019 **Merged by:** [@andrewrabert](https://github.com/andrewrabert) **Base:** `dev` ← **Head:** `mediaencoding-dev` --- ### 📝 Commits (3) - [`4b1f810`](https://github.com/jellyfin/jellyfin/commit/4b1f8108f739befb182ae0c72c31545448c41d00) Revert back to 197574f8114d0b11da466e63d0667a8dd1ba3dc5 for MediaEncoding - [`2d545ed`](https://github.com/jellyfin/jellyfin/commit/2d545ed09b8d4c26487579073e15960f24a2053f) Fix encoding profile handling for vaapi - [`5f733a8`](https://github.com/jellyfin/jellyfin/commit/5f733a89c5ecdbc4c7d67dd8665dbd343faec04c) Fix transcoding bitrate ### 📊 Changes **6 files changed** (+302 additions, -265 deletions) <details> <summary>View changed files</summary> 📝 `MediaBrowser.Api/Playback/StreamRequest.cs` (+0 -23) 📝 `MediaBrowser.Api/Playback/StreamState.cs` (+15 -77) 📝 `MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs` (+195 -81) 📝 `MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs` (+52 -21) 📝 `MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs` (+29 -12) 📝 `MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs` (+11 -51) </details> ### 📄 Description Revert back to 197574f8114d0b11da466e63d0667a8dd1ba3dc5 for MediaEncoding. This is the last commit including this code in this repo. This perhaps fixes #482, not sure. The generated CLI for nvenc seems not completely compliant with the ffmpeg wiki so it's perhaps something else. I don't have the hw to test right now. Remove some duplicate code that were causing warnings. Cherrypick PRs #198 and #202. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-07 05:43:33 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
EFjellyfin.db
area:database
awaiting-feedback
backend
blocked
breaking change: web api
bug
build
ci
confirmed
discussion needed
dotnet future
downstream
duplicate
enhancement
feature
future
github-actions
good first issue
hdr
help wanted
invalid
investigation
librarydb
live-tv
lyrics
media playback
music
needs testing
nuget
performance
platform
pull-request
Mirrored from GitHub Pull Request
 question
regression
release critical
requires-web
roadmap
security
security
stale
support
syncplay
ui & ux
upstream
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/jellyfin#8403
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?