From b9ee9b0660d10ea704396dbf2f51586fbed8c64b Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Tue, 12 May 2026 12:26:13 -0400 Subject: [PATCH 1/6] Backport pull request #16819 from jellyfin/release-10.11.z Fix rate control in av1_amf encoder Original-merge: a023b9c88dbd827f01a94780c5401a3ff132db69 Merged-by: Bond-009 Backported-by: Bond_009 --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 0eeb9e632c..65f6b79656 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1645,10 +1645,9 @@ namespace MediaBrowser.Controller.MediaEncoding } if (string.Equals(videoCodec, "h264_amf", StringComparison.OrdinalIgnoreCase) - || string.Equals(videoCodec, "hevc_amf", StringComparison.OrdinalIgnoreCase) - || string.Equals(videoCodec, "av1_amf", StringComparison.OrdinalIgnoreCase)) + || string.Equals(videoCodec, "hevc_amf", StringComparison.OrdinalIgnoreCase)) { - // Override the too high default qmin 18 in transcoding preset + // Override the too high default qmin 18 in transcoding preset in legacy h26x_amf return FormattableString.Invariant($" -rc cbr -qmin 0 -qmax 32 -b:v {bitrate} -maxrate {bitrate} -bufsize {bufsize}"); } From 04ecf77d97f5b4c9563aa088895a6d23de385e10 Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Tue, 12 May 2026 18:35:37 +0200 Subject: [PATCH 2/6] Reference correct .NET version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbd73edfcf..5e066f3d31 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ These instructions will help you get set up with a local development environment ### Prerequisites -Before the project can be built, you must first install the [.NET 9.0 SDK](https://dotnet.microsoft.com/download/dotnet) on your system. +Before the project can be built, you must first install the [.NET 10 SDK](https://dotnet.microsoft.com/download/dotnet) on your system. Instructions to run this project from the command line are included here, but you will also need to install an IDE if you want to debug the server while it is running. Any IDE that supports .NET 6 development will work, but two options are recent versions of [Visual Studio](https://visualstudio.microsoft.com/downloads/) (at least 2022) and [Visual Studio Code](https://code.visualstudio.com/Download). From 1872340a01e01ace2be61c6b8c317a32c56a9e13 Mon Sep 17 00:00:00 2001 From: Gargotaire Date: Tue, 12 May 2026 15:09:39 -0400 Subject: [PATCH 3/6] Translated using Weblate (Catalan) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ca/ --- Emby.Server.Implementations/Localization/Core/ca.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Localization/Core/ca.json b/Emby.Server.Implementations/Localization/Core/ca.json index f9543e6f4c..14838e8c34 100644 --- a/Emby.Server.Implementations/Localization/Core/ca.json +++ b/Emby.Server.Implementations/Localization/Core/ca.json @@ -135,5 +135,6 @@ "TaskMoveTrickplayImages": "Migració de la ubicació de la imatge de previsualització", "TaskMoveTrickplayImagesDescription": "Mou els fitxers existents d'imatges de previsualització segons la configuració de la mediateca.", "CleanupUserDataTaskDescription": "Neteja totes les dades d'usuari (estat de la visualització, estat dels preferits, etc.) del contingut multimèdia que no ha estat present durant almenys 90 dies.", - "CleanupUserDataTask": "Tasca de neteja de dades d'usuari" + "CleanupUserDataTask": "Tasca de neteja de dades d'usuari", + "Original": "Original" } From 7504875ccf8270279cc9018c3cf2a8d7f7e05339 Mon Sep 17 00:00:00 2001 From: Gallyam Biktashev Date: Tue, 12 May 2026 05:18:12 -0400 Subject: [PATCH 4/6] Translated using Weblate (Russian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ru/ --- Emby.Server.Implementations/Localization/Core/ru.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Localization/Core/ru.json b/Emby.Server.Implementations/Localization/Core/ru.json index 38920b6ede..c9a1c7eb87 100644 --- a/Emby.Server.Implementations/Localization/Core/ru.json +++ b/Emby.Server.Implementations/Localization/Core/ru.json @@ -135,5 +135,6 @@ "TaskExtractMediaSegmentsDescription": "Извлекает или получает медиасегменты из плагинов MediaSegment.", "TaskMoveTrickplayImagesDescription": "Перемещает существующие файлы trickplay в соответствии с настройками медиатеки.", "CleanupUserDataTask": "Задача очистки пользовательских данных", - "CleanupUserDataTaskDescription": "Очищает все пользовательские данные (состояние просмотра, статус избранного и т.д.) с медиа, отсутствующих по меньшей мере в течение 90 дней." + "CleanupUserDataTaskDescription": "Очищает все пользовательские данные (состояние просмотра, статус избранного и т.д.) с медиа, отсутствующих по меньшей мере в течение 90 дней.", + "Original": "Оригинальный" } From 2f27e9b5b6f8defd559237d3b18f7ad1e6c94d70 Mon Sep 17 00:00:00 2001 From: serzh-photograf Date: Tue, 12 May 2026 03:48:39 -0400 Subject: [PATCH 5/6] Translated using Weblate (Ukrainian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/uk/ --- Emby.Server.Implementations/Localization/Core/uk.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Localization/Core/uk.json b/Emby.Server.Implementations/Localization/Core/uk.json index 9246d9de20..61d5d6964c 100644 --- a/Emby.Server.Implementations/Localization/Core/uk.json +++ b/Emby.Server.Implementations/Localization/Core/uk.json @@ -135,5 +135,6 @@ "TaskMoveTrickplayImages": "Змінити місце розташування прев'ю-зображень", "TaskExtractMediaSegmentsDescription": "Витягує або отримує медіа-сегменти з плагінів з підтримкою MediaSegment.", "CleanupUserDataTask": "Завдання очищення даних користувача", - "CleanupUserDataTaskDescription": "Очищає всі дані користувача (стан перегляду, статус обраного тощо) з медіа, які перестали бути доступними щонайменше 90 днів тому." + "CleanupUserDataTaskDescription": "Очищає всі дані користувача (стан перегляду, статус обраного тощо) з медіа, які перестали бути доступними щонайменше 90 днів тому.", + "Original": "Оригінал" } From 6014ad6ef2b2ab071d5d6fc755fa27a8d6e185f5 Mon Sep 17 00:00:00 2001 From: Nicolas N Date: Mon, 11 May 2026 18:30:02 -0400 Subject: [PATCH 6/6] Translated using Weblate (Haitian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ht/ --- Emby.Server.Implementations/Localization/Core/ht.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Localization/Core/ht.json b/Emby.Server.Implementations/Localization/Core/ht.json index 183c422a85..f1ff775155 100644 --- a/Emby.Server.Implementations/Localization/Core/ht.json +++ b/Emby.Server.Implementations/Localization/Core/ht.json @@ -61,5 +61,7 @@ "TasksMaintenanceCategory": "Antretyen", "AppDeviceValues": "Aplikasyon: {0}, Aparèy: {1}", "AuthenticationSucceededWithUserName": "{0} otantifye avèk siksè", - "CameraImageUploadedFrom": "Une nouvelle image de la caméra a été téléchargée depuis {0}" + "CameraImageUploadedFrom": "Une nouvelle image de la caméra a été téléchargée depuis {0}", + "Original": "Original", + "Playlists": "Pleliss" }