Merge version 3.0.17.3-1+rpi1 and 3.0.17.4-1 to produce 3.0.17.4-1+rpi1

diff --cc debian/changelog
index 94f77730b18380fadd0459c073e459c2b7f56e9d,2772350c131256d0db27544e0df716a455ff1b92..6a402225b8447371a7f5283f5f37c7625d6034ae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- vlc (3.0.17.3-1+rpi1) bookworm-staging; urgency=medium
++vlc (3.0.17.4-1+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>  Thu, 17 Mar 2022 20:59:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Apr 2022 04:08:39 +0000
++
+ vlc (3.0.17.4-1) unstable; urgency=medium
+ 
+   * New upstream version 3.0.17.4
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 23 Apr 2022 15:37:39 +0200
  
  vlc (3.0.17.3-1) unstable; urgency=medium