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

[rbalint at users.alioth.debian.org]

Finalize changelog.
Enable x264 on mips64el and opencv on alpha.
Add avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch to fix CVE-2015-6761.
Remove hls-only-seek-if-there-is-an-offset.patch included upstream.
Merge tag 'upstream/2.8.1'
Imported Upstream version 2.8.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: e343a3b8c9ad0922cb9a487c9a3f238c5fe11fc4
X-Git-Newrev: 5942a40f956e535ad6fd268cc71f24bd1545210d

The following commit has been merged in the jessie branch:
commit ee38c545ba6b713b025d701f18fde9f4d5948958
Merge: e343a3b8c9ad0922cb9a487c9a3f238c5fe11fc4 2e636ca77811cdfba37f6a9e978cc415a94406c0
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Oct 23 19:00:39 2015 +0200

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

diff --combined debian/changelog
index d64b829,0783001..3dbf879
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
- ffmpeg (7:2.8-1~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:2.8.1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
-   * Add myself to uploaders
 +
-  -- Balint Reczey <balint at balintreczey.hu>  Tue, 06 Oct 2015 21:35:38 +0200
++ -- Balint Reczey <balint at balintreczey.hu>  Fri, 23 Oct 2015 19:00:53 +0200
++
+ ffmpeg (7:2.8.1-1) unstable; urgency=medium
+ 
+   [ Balint Reczey ]
+   * Add myself to uploaders.
+ 
+   [ Andreas Cadhalpun ]
+   * Import new upstream bugfix release 2.8.1.
+   * Remove hls-only-seek-if-there-is-an-offset.patch included upstream.
+   * Add avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch to
+     fix CVE-2015-6761.
+   * Enable x264 on mips64el and opencv on alpha.
+ 
+  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Thu, 15 Oct 2015 00:26:09 +0200
  
  ffmpeg (7:2.8-1) unstable; urgency=medium
  

-- 
ffmpeg packaging