[Pkg-chromium-commit] [pkg-chromium] 01/01: release 55.0.2883.75-2

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository pkg-chromium.

commit 4b47dbd9ddb78d321d57312a6623ee0e0862cf27
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Dec 11 04:12:00 2016 +0000

    release 55.0.2883.75-2
---
 debian/changelog                   |  7 ++++++
 debian/patches/system/ffmpeg.patch | 44 ++++++++++----------------------------
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98eead0..bec10d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chromium-browser (55.0.2883.75-2) unstable; urgency=medium
+
+  * Don't set FF_API_CONVERGENCE_DURATION since it is not a part of ffmpeg's
+    public API, and when defined leads to crashes (closes: #846648).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 10 Dec 2016 22:24:06 +0000
+
 chromium-browser (55.0.2883.75-1) unstable; urgency=medium
 
   * New upstream stable release:
diff --git a/debian/patches/system/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
index d0299b2..cec3d16 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -1,13 +1,17 @@
-Description: Don't change the FFmpeg ABI in chromium ...
- ... because it breaks ABI compatibility with the system FFmpeg.
- And don't use private API, which can change at any time.
-
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2015-07-26>
+description: don't use ffmpeg's private API, which can change at any time.
+author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
 
 --- a/media/ffmpeg/ffmpeg_common.h
 +++ b/media/ffmpeg/ffmpeg_common.h
-@@ -39,7 +39,6 @@ extern "C" {
+@@ -25,7 +25,6 @@ extern "C" {
+ // Disable deprecated features which result in spammy compile warnings.  This
+ // list of defines must mirror those in the 'defines' section of FFmpeg's
+ // BUILD.gn file or the headers below will generate different structures!
+-#define FF_API_CONVERGENCE_DURATION 0
+ // Upstream libavcodec/utils.c still uses the deprecated
+ // av_dup_packet(), causing deprecation warnings.
+ // The normal fix for such things is to disable the feature as below,
+@@ -39,7 +38,6 @@ extern "C" {
  MSVC_PUSH_DISABLE_WARNING(4244);
  #include <libavcodec/avcodec.h>
  #include <libavformat/avformat.h>
@@ -42,29 +46,3 @@ Last-Update: <2015-07-26>
  
    std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
  
---- a/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-+++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-@@ -15,9 +15,9 @@
- #include <limits>
- 
- extern "C" {
--#include "third_party/ffmpeg/libavcodec/avcodec.h"
--#include "third_party/ffmpeg/libavformat/avformat.h"
--#include "third_party/ffmpeg/libavutil/imgutils.h"
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavutil/imgutils.h>
- }  // extern "C"
- 
- #include "webrtc/base/checks.h"
---- a/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
-+++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
-@@ -17,7 +17,7 @@
- #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
- 
- extern "C" {
--#include "third_party/ffmpeg/libavcodec/avcodec.h"
-+#include <libavcodec/avcodec.h>
- }  // extern "C"
- 
- #include "webrtc/common_video/include/i420_buffer_pool.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git