On 2016-04-16 10:20:26, Michael Gilbert wrote:
> control: tag -1 help, confirmed
> control: severity -1 grave
> x-debbugs-cc: pkg-multimedia-maintain...@lists.alioth.debian.org
>
> Jose A. Fernandez Gonzalez wrote:
> > Version 49 of Chromium and earlier versions depend on ffmpeg libraries
> > (libavcodec, libavformat, libavutil, ...) and it seems version 50 doesn't
> > depend on those libraries, maybe the problem comes out with HTML5 content
> > because of that.
>
> Chromium's linking of ffmpeg has somehow changed, so ffmpeg.patch will
> need to be updated, or the embedded copy of ffmpeg could be used
> again.
>
> I don't have much free time right now, so it may be some time before I
> get to this. Help is appreciated.
With the attached patch chromium links against ffmpeg at least. Other than that
it's untested.
Regards
--
Sebastian Ramacher
diff -Nru chromium-browser-50.0.2661.75/debian/changelog chromium-browser-50.0.2661.75/debian/changelog
--- chromium-browser-50.0.2661.75/debian/changelog 2016-04-14 03:10:04.0 +0200
+++ chromium-browser-50.0.2661.75/debian/changelog 2016-04-19 23:50:29.0 +0200
@@ -1,3 +1,10 @@
+chromium-browser (50.0.2661.75-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ *
+
+ -- Sebastian Ramacher Tue, 19 Apr 2016 23:50:28 +0200
+
chromium-browser (50.0.2661.75-1) unstable; urgency=medium
* New upstream stable release:
diff -Nru chromium-browser-50.0.2661.75/debian/patches/system/ffmpeg.patch chromium-browser-50.0.2661.75/debian/patches/system/ffmpeg.patch
--- chromium-browser-50.0.2661.75/debian/patches/system/ffmpeg.patch 2016-04-14 03:49:09.0 +0200
+++ chromium-browser-50.0.2661.75/debian/patches/system/ffmpeg.patch 2016-04-19 23:42:52.0 +0200
@@ -7,7 +7,7 @@
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -38,7 +38,6 @@ extern "C" {
+@@ -38,7 +38,6 @@
MSVC_PUSH_DISABLE_WARNING(4244);
#include
#include
@@ -17,7 +17,7 @@
#include
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -874,7 +874,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
+@@ -874,7 +874,11 @@
// this does not increase the amount of data downloaded. The default value
// is 5 AV_TIME_BASE units (1 second each), which prevents some oddly muxed
// streams from being detected properly; this value was chosen arbitrarily.
@@ -29,7 +29,7 @@
// Open the AVFormatContext using our glue layer.
CHECK(blocking_thread_.Start());
-@@ -1034,24 +1038,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1034,24 +1038,6 @@
// If no estimate is found, the stream entry will be kInfiniteDuration().
std::vector start_time_estimates(format_context->nb_streams,
kInfiniteDuration());
@@ -176,3 +176,152 @@
'../third_party/mesa/mesa.gyp:osmesa',
],
}],
+--- a/third_party/webrtc/modules/video_coding/codecs/h264/h264.gypi
b/third_party/webrtc/modules/video_coding/codecs/h264/h264.gypi
+@@ -38,7 +38,7 @@
+ }],
+ ],
+ 'dependencies': [
+-'<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++'<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/third_party/openh264/openh264.gyp:openh264_encoder',
+ '<(webrtc_root)/common_video/common_video.gyp:common_video',
+ ],
+--- 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
+
+ extern "C" {
+-#include "third_party/ffmpeg/libavcodec/avcodec.h"
+-#include "third_party/ffmpeg/libavformat/avformat.h"
+-#include "third_party/ffmpeg/libavutil/imgutils.h"
++#include
++#include
++#include
+ } // 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
+@@ -15,7 +15,7 @@
+ #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
+
+ extern "C" {
+-#include "third_party/ffmpeg/libavcodec/avcodec.h"
++#include
+ } // extern "C"
+
+ #include "webrtc/base/scoped_ptr.h"
+--- a/tools/gyp/tools/emacs/testdata/media.gyp
b/tools/gyp/tools/emacs/testdata/media.gyp
+@@ -299,7 +299,7 @@
+ # and exclude the sources which depend on ffmpeg.
+ ['OS != "android"', {
+ 'dependencies': [
+-'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++'../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ }],
+ ['OS == "android"', {
+@@ -721,7 +721,7 @@
+ }],
+ ['OS != "android"', {
+ 'dependencies': [
+-'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++'../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ }],
+ ['OS ==