Merge version 3.0.21-1+rpi1 and 3.0.21-2 to produce 3.0.21-2+rpi1

diff --cc debian/changelog
index dca6910d876c587c33974677b53c83ae3956e2d2,8d93bdb2d6a92610a8bb27c9bc8287be10b06a67..d9f8b6d2d826be38fb9841e4851f2aa549d23cc1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- vlc (3.0.21-1+rpi1) trixie-staging; urgency=medium
++vlc (3.0.21-2+rpi1) trixie-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>  Wed, 12 Jun 2024 14:31:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Aug 2024 04:45:06 +0000
++
+ vlc (3.0.21-2) unstable; urgency=medium
+ 
+   * debian/patches: Apply WIP patches for ffmpeg 7.0 support (Closes:
+     #1072456)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 15 Aug 2024 12:11:01 +0200
  
  vlc (3.0.21-1) unstable; urgency=medium