From 90840b3ede70bff6705b1a63ccd3044d9b45b1b7 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 17 Mar 2026 11:44:50 -0400 Subject: [PATCH] Rename deprecated ffmpeg `vsync` arg to `fps_mode` (#38198) --- README.md | 1 + lib/paperclip/transcoder.rb | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7d72b35249f..db8dcaace32 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ Mastodon is a **free, open-source social network server** based on [ActivityPub] - **PostgreSQL** 14+ - **Redis** 7.0+ - **Node.js** 20+ +- **FFmpeg** 5.1+ This repository includes deployment configurations for **Docker and docker-compose**, as well as for other environments like Heroku and Scalingo. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). A [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the main documentation. diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb index 47e3f9f547f..c2017b8d3a2 100644 --- a/lib/paperclip/transcoder.rb +++ b/lib/paperclip/transcoder.rb @@ -51,10 +51,7 @@ module Paperclip @output_options['maxrate'] = bitrate + 192_000 @output_options['bufsize'] = bitrate * 5 - if high_vfr?(metadata) - # TODO: change to `fps_mode` in the future, as `vsync` is being deprecated - @output_options['vsync'] = 'vfr' - end + @output_options['fps_mode'] = 'vfr' if high_vfr?(metadata) end end