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

diff --cc debian/changelog
index 6683cb3b63e77dcc229b9fd4f7e6953415c67cbb,83fc9f5881c2d742b9ed2ad0bd7c8178a1255223..6b11d0f015642c029f51a6077b356d8b932e21d0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- x264 (2:0.164.3095+gitbaee400-3+rpi1) bookworm-staging; urgency=medium
++x264 (2:0.164.3108+git31e19f9-1+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>  Sun, 14 May 2023 15:54:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Feb 2024 16:15:28 +0000
++
+ x264 (2:0.164.3108+git31e19f9-1) unstable; urgency=medium
+ 
+   * Update to new stable upstream
+   * New upstream version 0.164.3108+git31e19f9
+   * Regenerate manpage
+ 
+  -- Rico Tzschichholz <ricotz@ubuntu.com>  Sun, 28 Jan 2024 22:48:50 +0100
  
  x264 (2:0.164.3095+gitbaee400-3) unstable; urgency=medium