diff -Nru ffmpeg-4.4.1/debian/changelog ffmpeg-4.4.1/debian/changelog --- ffmpeg-4.4.1/debian/changelog 2021-11-21 17:48:57.000000000 +0000 +++ ffmpeg-4.4.1/debian/changelog 2021-11-28 00:07:36.000000000 +0000 @@ -1,3 +1,10 @@ +ffmpeg (7:4.4.1-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 7:4.4-5+rpi1 by Peter Michael Green at Sun, 05 Sep 2021 20:59:14 +0000] + * Link with libatomic on armhf too. + + -- Raspbian forward porter 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 diff -Nru ffmpeg-4.4.1/debian/rules ffmpeg-4.4.1/debian/rules --- ffmpeg-4.4.1/debian/rules 2021-11-21 17:30:36.000000000 +0000 +++ ffmpeg-4.4.1/debian/rules 2021-11-28 00:07:36.000000000 +0000 @@ -79,7 +79,7 @@ --enable-sdl2 # link with -latomic on armel and mipsel (https://trac.ffmpeg.org/ticket/9275) -ifneq (,$(filter armel mipsel,$(DEB_HOST_ARCH))) +ifneq (,$(filter armel armhf mipsel,$(DEB_HOST_ARCH))) CONFIG += --extra-libs=-latomic endif