[SCM] ffmpeg/jessie: Merge tag 'debian/7%2.8.4-1' into jessie

[rbalint at users.alioth.debian.org]

Finalize changelog.
Also build standard flavor in a subdirectory. (Closes: #804284)
Add patch to make apidoc output independent of SRC_PATH.
Re-enable libsoxr as glibc bug #793641 is now fixed in testing.
Change section of libavcodec-extra from libs to metapackages.
Merge tag 'upstream/2.8.4'
Imported Upstream version 2.8.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: 5942a40f956e535ad6fd268cc71f24bd1545210d
X-Git-Newrev: f4f72e07462e11f3b414f808400876fef90dbec2

The following commit has been merged in the jessie branch:
commit f4f72e07462e11f3b414f808400876fef90dbec2
Merge: 5942a40f956e535ad6fd268cc71f24bd1545210d b37a6cb403755ea922eca65d47c54524d6ca6ba4
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Jan 7 23:06:13 2016 +0100

    Merge tag 'debian/7%2.8.4-1' into jessie
    
    ffmpeg Debian release 7:2.8.4-1
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 2169bae,45a4bae..291482a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,12 +1,18 @@@
- ffmpeg (7:2.8.3-1~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:2.8.4-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
-  -- Balint Reczey <balint at balintreczey.hu>  Sun, 06 Dec 2015 22:16:41 +0100
++ -- Balint Reczey <balint at balintreczey.hu>  Thu, 07 Jan 2016 23:04:25 +0100
++
+ ffmpeg (7:2.8.4-1) unstable; urgency=medium
+ 
+   * Import new upstream bugfix release 2.8.4.
+   * Change section of libavcodec-extra from libs to metapackages.
+   * Re-enable libsoxr as glibc bug #793641 is now fixed in testing.
+   * Add patch to make apidoc output independent of SRC_PATH.
+   * Also build standard flavor in a subdirectory. (Closes: #804284)
+ 
+  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Sun, 20 Dec 2015 23:12:56 +0100
  
  ffmpeg (7:2.8.3-1) unstable; urgency=medium
  
@@@ -26,7 -30,6 +36,6 @@@ ffmpeg (7:2.8.2-1) unstable; urgency=me
    * Re-enable libdc1394 on sparc64, as libudev is working again.
  
   -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Thu, 12 Nov 2015 23:58:49 +0100
- >>>>>>> debian/7%2.8.3-1
  
  ffmpeg (7:2.8.1-1) unstable; urgency=medium
  

-- 
ffmpeg packaging