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

diff --cc debian/changelog
index 63f9c16e38633cad6e7c278e902b366cc0c11dbd,e3a89d8fde0eaa65a914fd4d08be2fd2522f1f96..63f83cb855bd78eb04cf0c62ebfd02be9bf55d91
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- vlc (3.0.12-1+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.12-2+rpi1) bullseye-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>  Mon, 25 Jan 2021 00:51:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 06:02:20 +0000
++
+ vlc (3.0.12-2) unstable; urgency=medium
+ 
+   * debian/: Disable live555 plugin due to ä981439
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 31 Jan 2021 11:40:59 +0100
  
  vlc (3.0.12-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge