Merge version 1.0.4-1+rpi1 and 1.0.7-1 to produce 1.0.7-1+rpi1

diff --cc configure.ac
Simple merge

diff --cc debian/changelog
index bcf0fbf57d16990ad779cac870018e6dc8ab929f,75595104c1b63f497138cd4d5fc68639d78e642f..73dac31e6e25a0d04979732df1c4892dea440a4a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- libde265 (1.0.4-1+rpi1) bullseye-staging; urgency=medium
++libde265 (1.0.7-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 04 Oct 2015 21:44:10 +0000]
 +  * Disable neon.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Dec 2019 17:38:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Oct 2020 22:48:29 +0000
++
+ libde265 (1.0.7-1) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Set upstream metadata fields: Bug-Submit.
+ 
+   [ Joachim Bauch ]
+   * Imported Upstream version 1.0.7
+   * Update patches for new upstream version.
+   * Update symbols for new upstream version.
+   * Bump "Standards-Version" to 4.5.0
+ 
+  -- Joachim Bauch <bauch@struktur.de>  Fri, 25 Sep 2020 13:00:59 +0200
  
  libde265 (1.0.4-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 86a210b5ddb6912be705e0979d0ee9f0476943ec,bf0fa0845ae14c3c9c514ea9e018350e7837958e..59032d3877a430779c8290786355c5a12ae1bb9f
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,3 +1,4 @@@
  only_export_decoder_api.patch
  disable_tools.patch
- ffmpeg_2.9.patch
+ fix_exported_symbols.patch
 +disable-neon.patch