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

[rbalint at users.alioth.debian.org]

Add (Closes: #806519) to the changelog.
finalize changelog
Respect CC and CXX from the environment in debian/rules.
Merge tag 'upstream/2.8.3'
Imported Upstream version 2.8.3
Switch debian/watch to xz instead of gz.
Finalize changelog.
Re-enable libdc1394 on sparc64, as libudev is working again.
Drop now unnecessary embedded-library lintian-overrides.
Add build-profile support for stage1, disabling frei0r, opencv and x264.
Remove now unused bootstrap sources.
Use system bootstrap for ffmpeg-doc.
Drop avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch included upstream.
Update changelog.
Merge tag 'upstream/2.8.2'
Imported Upstream version 2.8.2
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 5942a40f956e535ad6fd268cc71f24bd1545210d
Merge: ee38c545ba6b713b025d701f18fde9f4d5948958 36fa84851171237bb38a5c90b368edb0bc825c5c
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Dec 6 22:16:54 2015 +0100

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

diff --combined debian/changelog
index 3dbf879,82f2163..2169bae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,25 +1,32 @@@
- ffmpeg (7:2.8.1-1~bpo8+1) jessie-backports; urgency=medium
++ffmpeg (7:2.8.3-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
-  -- Balint Reczey <balint at balintreczey.hu>  Fri, 23 Oct 2015 19:00:53 +0200
++ -- Balint Reczey <balint at balintreczey.hu>  Sun, 06 Dec 2015 22:16:41 +0100
++
+ ffmpeg (7:2.8.3-1) unstable; urgency=medium
+ 
+   * Switch debian/watch to xz instead of gz.
+   * Import new upstream bugfix release 2.8.3.
+     Fixes CVE-2015-8363, CVE-2015-8364 and CVE-2015-8365. (Closes: #806519)
+   * Respect CC and CXX from the environment in debian/rules.
+ 
+  -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Sat, 28 Nov 2015 11:39:49 +0100
+ 
+ ffmpeg (7:2.8.2-1) unstable; urgency=medium
+ 
+   * Import new upstream bugfix release 2.8.2.
+      - videodsp: don't overread edges in vfix3 emu_edge. (Closes: #801745)
+   * Drop avcodec-vp8-Do-not-use-num_coeff_partitions-in-thread.patch
+     included upstream.
+   * Use system bootstrap for ffmpeg-doc.
+   * Remove now unused bootstrap sources.
+   * Add build-profile support for stage1, disabling frei0r, opencv and x264.
+   * Drop now unnecessary embedded-library lintian-overrides.
+   * 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