From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 5 Nov 2021 03:42:47 +0000 (+0000)
Subject: Merge version 7:4.4-6+rpi1 and 7:4.4.1-1 to produce 7:4.4.1-1+rpi1
X-Git-Tag: archive/raspbian/7%4.4.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9ca2795bd746d0d9d41ca003af01549969564081;p=ffmpeg.git

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

9ca2795bd746d0d9d41ca003af01549969564081
diff --cc debian/changelog
index ec5b100,736d7c6..60eab4c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- ffmpeg (7:4.4-6+rpi1) bookworm-staging; urgency=medium
++ffmpeg (7:4.4.1-1+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>  Thu, 23 Sep 2021 15:40:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Nov 2021 03:42:46 +0000
++
+ ffmpeg (7:4.4.1-1) unstable; urgency=medium
+ 
+   * New upstream version 4.4.1
+   * debian/tests: Limit the number of threads to max of 8
+   * debian/patches: Apply upstream patch to fix build on armhf with GCC 11
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 28 Oct 2021 21:43:55 +0200
  
  ffmpeg (7:4.4-6) unstable; urgency=medium