From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 27 Jan 2022 09:12:32 +0000 (+0000)
Subject: Merge version 7:4.4.1-2+rpi1 and 7:4.4.1-3 to produce 7:4.4.1-3+rpi1
X-Git-Tag: archive/raspbian/7%4.4.1-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ca119e1cec81ac8a9b4dc3e67bed38d9c0e70d84;p=ffmpeg.git

Merge version 7:4.4.1-2+rpi1 and 7:4.4.1-3 to produce 7:4.4.1-3+rpi1
---

ca119e1cec81ac8a9b4dc3e67bed38d9c0e70d84
diff --cc debian/changelog
index 671bc00,889d039..1db5cc6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- ffmpeg (7:4.4.1-2+rpi1) bookworm-staging; urgency=medium
++ffmpeg (7:4.4.1-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 7:4.4-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 05 Sep 2021 20:59:14 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 28 Nov 2021 00:07:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Jan 2022 09:12:32 +0000
++
+ ffmpeg (7:4.4.1-3) unstable; urgency=medium
+ 
+   [ Pino Toscano ]
+   * Restrict the clang Build-Depends to amd64 arm64 ppc64el, where CUDA exists.
+     (Closes: #994537)
+ 
+   [ Sebastian Ramacher ]
+   * debian/control:
+     - Also enable cuda_llvm on i386
+     - Suggest packages for nvenc
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 15 Jan 2022 17:49:38 +0100
  
  ffmpeg (7:4.4.1-2) unstable; urgency=medium