Merge version 3.0.17.4-4+rpi1 and 3.0.17.4-5 to produce 3.0.17.4-5+rpi1

diff --cc debian/changelog
index 89b5e89898ac93083325651b0ac2e88e14adccfe,fc39537928629ad260de044e626a4131ffbb2c80..8d8af29d060864d79ee8b04661cded4082ee04c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- vlc (3.0.17.4-4+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.17.4-5+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.11.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2020 00:37:35 +0000]
 +  * Add extern to three functions for gcc-10 compatibility.
 +  * Partially fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Jul 2022 22:45:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 10 Oct 2022 02:23:06 +0000
++
+ vlc (3.0.17.4-5) unstable; urgency=medium
+ 
+   * debian/rules:
+     - Revert "Disable libva support"
+     - Do not pass any libva flags (Closes: #1021032) (LP: #1991457)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Mon, 03 Oct 2022 22:07:16 +0200
  
  vlc (3.0.17.4-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge