diff --git a/multimedia/av1an/files/patch-cargo-crates_ffmpeg-sys-next-4.4.0_src_avutil_pixfmt.rs b/multimedia/av1an/files/patch-cargo-crates_ffmpeg-sys-next-4.4.0_src_avutil_pixfmt.rs
deleted file mode 100644
index b567c08cd69f..000000000000
--- a/multimedia/av1an/files/patch-cargo-crates_ffmpeg-sys-next-4.4.0_src_avutil_pixfmt.rs
+++ /dev/null
@@ -1,10 +0,0 @@
---- cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs.orig	2022-01-03 20:02:01 UTC
-+++ cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs
-@@ -35,6 +35,7 @@ pub const AV_PIX_FMT_BGR555: AVPixelFormat = AV_PIX_FM
- #[cfg(target_endian = "little")]
- pub const AV_PIX_FMT_BGR444: AVPixelFormat = AV_PIX_FMT_BGR444LE;
- 
-+#[cfg(target_endian = "little")]
- pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9LE;
- #[cfg(target_endian = "little")]
- pub const AV_PIX_FMT_YUV422P9: AVPixelFormat = AV_PIX_FMT_YUV422P9LE;
diff --git a/multimedia/av1an/files/patch-ffmpeg b/multimedia/av1an/files/patch-ffmpeg
index b8ab02548b34..a6972269c04d 100644
--- a/multimedia/av1an/files/patch-ffmpeg
+++ b/multimedia/av1an/files/patch-ffmpeg
@@ -1,63 +1,86 @@
 https://github.com/zmwangx/rust-ffmpeg/issues/63
 
 error[E0432]: unresolved imports `libc::ENODATA`, `libc::ENOSR`, `libc::ENOSTR`, `libc::ETIME`
   --> cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs:20:22
    |
 20 |     ENFILE, ENOBUFS, ENODATA, ENODEV, ENOENT, ENOEXEC, ENOLCK, ENOLINK, ENOMEM, ENOMSG,
    |                      ^^^^^^^ no `ENODATA` in the root
 21 |     ENOPROTOOPT, ENOSPC, ENOSR, ENOSTR, ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE,
    |                          ^^^^^  ^^^^^^ no `ENOSTR` in the root
    |                          |
    |                          no `ENOSR` in the root
 22 |     ENOTSOCK, ENOTSUP, ENOTTY, ENXIO, EOPNOTSUPP, EOVERFLOW, EOWNERDEAD, EPERM, EPIPE, EPROTO,
 23 |     EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, ESRCH, ETIME, ETIMEDOUT, ETXTBSY,
    |                                                                ^^^^^ no `ETIME` in the root
    |
 help: a similar name exists in the module
    |
 21 |     ENOPROTOOPT, ENOSPC, ENOSR, NOSTR, ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE,
    |                                 ~~~~~
 help: a similar name exists in the module
    |
 23 |     EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, ESRCH, VTIME, ETIMEDOUT, ETXTBSY,
    |                                                                ~~~~~
 
 https://github.com/zmwangx/rust-ffmpeg/commit/d5e9f34b6a3c
 
 error[E0308]: mismatched types
    --> cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs:205:7
     |
 205 |     [[0_i8; AV_ERROR_MAX_STRING_SIZE]; 27];
     |       ^^^^ expected `u8`, found `i8`
     |
 help: change the type of the numeric literal from `i8` to `u8`
     |
 205 |     [[0_u8; AV_ERROR_MAX_STRING_SIZE]; 27];
     |       ~~~~
 
+https://github.com/zmwangx/rust-ffmpeg-sys/commit/b9382c010ab2
+
+error[E0428]: the name `AV_PIX_FMT_YUV420P9` is defined multiple times
+   --> cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs:155:1
+    |
+38  | pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9LE;
+    | --------------------------------------------------------------------- previous definition of the value `AV_PIX_FMT_YUV420P9` here
+...
+155 | pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9BE;
+    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `AV_PIX_FMT_YUV420P9` redefined here
+    |
+    = note: `AV_PIX_FMT_YUV420P9` must be defined only once in the value namespace of this module
+
 --- cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs.orig	1970-01-01 00:00:00 UTC
 +++ cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs
 @@ -17,10 +17,10 @@ pub use libc::{
      EBUSY, ECANCELED, ECHILD, ECONNABORTED, ECONNREFUSED, ECONNRESET, EDEADLK, EDESTADDRREQ, EDOM,
      EEXIST, EFAULT, EFBIG, EHOSTUNREACH, EIDRM, EILSEQ, EINPROGRESS, EINTR, EINVAL, EIO, EISCONN,
      EISDIR, ELOOP, EMFILE, EMLINK, EMSGSIZE, ENAMETOOLONG, ENETDOWN, ENETRESET, ENETUNREACH,
 -    ENFILE, ENOBUFS, ENODATA, ENODEV, ENOENT, ENOEXEC, ENOLCK, ENOLINK, ENOMEM, ENOMSG,
 -    ENOPROTOOPT, ENOSPC, ENOSR, ENOSTR, ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE,
 +    ENFILE, ENOBUFS, ENODEV, ENOENT, ENOEXEC, ENOLCK, ENOLINK, ENOMEM, ENOMSG,
 +    ENOPROTOOPT, ENOSPC, ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE,
      ENOTSOCK, ENOTSUP, ENOTTY, ENXIO, EOPNOTSUPP, EOVERFLOW, EOWNERDEAD, EPERM, EPIPE, EPROTO,
 -    EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, ESRCH, ETIME, ETIMEDOUT, ETXTBSY,
 +    EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, ESRCH, ETIMEDOUT, ETXTBSY,
      EWOULDBLOCK, EXDEV,
  };
  
 @@ -201,8 +201,7 @@ fn index(error: &Error) -> usize {
  }
  
  // XXX: the length has to be synced with the number of errors
 -static mut STRINGS: [[c_char; AV_ERROR_MAX_STRING_SIZE]; 27] =
 -    [[0_i8; AV_ERROR_MAX_STRING_SIZE]; 27];
 +static mut STRINGS: [[c_char; AV_ERROR_MAX_STRING_SIZE]; 27] = [[0; AV_ERROR_MAX_STRING_SIZE]; 27];
  
  pub fn register_all() {
      unsafe {
+--- cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs
+@@ -35,6 +35,7 @@ pub const AV_PIX_FMT_BGR555: AVPixelFormat = AV_PIX_FM
+ #[cfg(target_endian = "little")]
+ pub const AV_PIX_FMT_BGR444: AVPixelFormat = AV_PIX_FMT_BGR444LE;
+ 
++#[cfg(target_endian = "little")]
+ pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9LE;
+ #[cfg(target_endian = "little")]
+ pub const AV_PIX_FMT_YUV422P9: AVPixelFormat = AV_PIX_FMT_YUV422P9LE;