From b90dcd024552339373874ad2cc20bbd0b500fe9e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2026 12:15:01 +0200
Subject: [PATCH 1/2] Update dependency FFmpeg/FFmpeg to v8.1.2 (#39464)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0799a7b66f..c95f356937 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -234,7 +234,7 @@ FROM media-build AS ffmpeg
 
 # ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"]
 # renovate: datasource=github-tags depName=FFmpeg/FFmpeg extractVersion=^n(?<version>\d+\.\d+(\.\d+)?)$
-ARG FFMPEG_VERSION=8.1.1
+ARG FFMPEG_VERSION=8.1.2
 # ffmpeg download URL, change with [--build-arg FFMPEG_URL="https://ffmpeg.org/releases"]
 ARG FFMPEG_URL=https://github.com/FFmpeg/FFmpeg/archive/refs/tags
 

From 70d39d364ba6183a2b6e2f763204fe2c21e0ca42 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 25 Jun 2026 10:21:13 +0200
Subject: [PATCH 2/2] Bump version to v4.6.2

---
 CHANGELOG.md            | 6 ++++++
 docker-compose.yml      | 6 +++---
 lib/mastodon/version.rb | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5280b940ee..0a32b14065 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.6.2] - 2026-06-25
+
+### Security
+
+- Update FFMpeg version used in the container image to fix [CVE-2026-8461](https://github.com/advisories/GHSA-qff7-4q6c-m8h6) (critical severity)
+
 ## [4.6.1] - 2026-06-24
 
 ### Security
diff --git a/docker-compose.yml b/docker-compose.yml
index 993b06e5b1..61dc92f3dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,7 +60,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.6.1
+    image: ghcr.io/mastodon/mastodon:v4.6.2
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -84,7 +84,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.6.1
+    image: ghcr.io/mastodon/mastodon-streaming:v4.6.2
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -103,7 +103,7 @@ services:
   sidekiq:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.6.1
+    image: ghcr.io/mastodon/mastodon:v4.6.2
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 6f1ea7547f..94989dd41a 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      1
+      2
     end
 
     def default_prerelease