From 52c47fdfc995ce8898b73b19c72039122fc7f453 Mon Sep 17 00:00:00 2001
From: Russell Greene <russell@shotover.com>
Date: Thu, 23 Nov 2023 18:14:02 -0700
Subject: [PATCH] support ffmpeg 6.1

---
 Cargo.lock | 14 ++++++--------
 Cargo.toml |  8 +++++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f2c82e5..c248a94 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -208,8 +208,7 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 [[package]]
 name = "ffmpeg-next"
 version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8af03c47ad26832ab3aabc4cdbf210af3d3b878783edd5a7ba044ba33aab7a60"
+source = "git+https://github.com/zmwangx/rust-ffmpeg?rev=24ccb76c8c99d1dd53addb1d4056aed450138567#24ccb76c8c99d1dd53addb1d4056aed450138567"
 dependencies = [
  "bitflags 1.3.2",
  "ffmpeg-sys-next",
@@ -219,8 +218,7 @@ dependencies = [
 [[package]]
 name = "ffmpeg-sys-next"
 version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf650f461ccf130f4eef4927affed703cc387b183bfc4a7dfee86a076c131127"
+source = "git+https://github.com/AdrianEddy/rust-ffmpeg-sys?rev=f58d6f20afa3859f8b3aa00b064a5336f641e63e#f58d6f20afa3859f8b3aa00b064a5336f641e63e"
 dependencies = [
  "bindgen",
  "cc",
@@ -456,18 +454,18 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 77f4721..68c7d15 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,9 @@ wayland-protocols = { version = "0.31", features = [
     "staging",
 ] }
 wayland-protocols-wlr = { version = "0.2", features = ["client"] }
-ffmpeg-next = "6.0.0"
+
+# ffmpeg-next does not support ffmpeg 6.1 yet, so grab from the 6.1 PR
+ffmpeg-next = { git = "https://github.com/zmwangx/rust-ffmpeg", rev = "24ccb76c8c99d1dd53addb1d4056aed450138567" }
 thiserror = "1.0.38"
 drm-fourcc = "2.2.0"
 human-size = "0.4.2"
@@ -44,3 +46,7 @@ serde_json = "1.0.103"
 
 [profile.release]
 lto = "thin"
+
+# seee above
+[patch.crates-io]
+ffmpeg-sys-next = { git = "https://github.com/AdrianEddy/rust-ffmpeg-sys", rev = "f58d6f20afa3859f8b3aa00b064a5336f641e63e" }