Merge version 2:0.164.3108+git31e19f9-1+rpi1 and 2:0.164.3108+git31e19f9-2 to produce...

diff --cc debian/changelog
index 6b11d0f015642c029f51a6077b356d8b932e21d0,6b45e203db658d4f2a27b1185b32f9955f4745a0..c89332909bbccbf1371b9051edc45ca5d502acff
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- x264 (2:0.164.3108+git31e19f9-1+rpi1) trixie-staging; urgency=medium
++x264 (2:0.164.3108+git31e19f9-2+rpi1) trixie-staging; urgency=medium
 +
 +  [Changes introduced in 2:0.142.2431+gita5831aa-1+rpi2 by Peter Michael Green]
 +  * Revert previous raspbian changes (not all of which were mentioned
 +    in the changelog, start again from debian source)
 +  * Pass --disable-asm for static build to prevent it being
 +    armv7/neon contaminated.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Feb 2024 16:15:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Aug 2024 23:06:14 +0000
++
+ x264 (2:0.164.3108+git31e19f9-2) unstable; urgency=medium
+ 
+   * Team upload
+   * debian/patches: Fix incompatible pointer type errors on ppc64el
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 30 Jul 2024 15:11:15 +0200
  
  x264 (2:0.164.3108+git31e19f9-1) unstable; urgency=medium