From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 28 Nov 2021 00:07:36 +0000 (+0000)
Subject: Merge version 7:4.4.1-1+rpi1 and 7:4.4.1-2 to produce 7:4.4.1-2+rpi1
X-Git-Tag: archive/raspbian/7%4.4.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=737aa3fe35f81f5d08ab1d270cd0174592882e20;p=ffmpeg.git

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

737aa3fe35f81f5d08ab1d270cd0174592882e20
diff --cc debian/changelog
index 60eab4c,c41857c..671bc00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- ffmpeg (7:4.4.1-1+rpi1) bookworm-staging; urgency=medium
++ffmpeg (7:4.4.1-2+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>  Fri, 05 Nov 2021 03:42:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 28 Nov 2021 00:07:36 +0000
++
+ ffmpeg (7:4.4.1-2) unstable; urgency=medium
+ 
+   * debian/control: Add Build-Depends on libffmpeg-nvenc-dev on amd64, arm64
+     and i386 (Closes: #925941)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 21 Nov 2021 18:48:57 +0100
  
  ffmpeg (7:4.4.1-1) unstable; urgency=medium