1 |
phajdan.jr 13/03/01 20:56:03 |
2 |
|
3 |
Added: chromium-system-ffmpeg-r4.patch |
4 |
Log: |
5 |
Add missing patch, reported by Andrei Frunza. |
6 |
|
7 |
(Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key 30427902) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 www-client/chromium/files/chromium-system-ffmpeg-r4.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r4.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r4.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: chromium-system-ffmpeg-r4.patch |
16 |
=================================================================== |
17 |
diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h |
18 |
index 17241b9..8a92312 100644 |
19 |
--- a/media/filters/ffmpeg_glue.h |
20 |
+++ b/media/filters/ffmpeg_glue.h |
21 |
@@ -28,9 +28,9 @@ |
22 |
#include "base/basictypes.h" |
23 |
#include "base/memory/scoped_ptr.h" |
24 |
#include "media/base/media_export.h" |
25 |
+#include "media/ffmpeg/ffmpeg_common.h" |
26 |
|
27 |
struct AVFormatContext; |
28 |
-struct AVIOContext; |
29 |
|
30 |
namespace media { |
31 |
|
32 |
diff --git a/media/media.gyp b/media/media.gyp |
33 |
index df217d2..fde3830 100644 |
34 |
--- a/media/media.gyp |
35 |
+++ b/media/media.gyp |
36 |
@@ -363,6 +363,9 @@ |
37 |
'dependencies': [ |
38 |
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |
39 |
], |
40 |
+ 'export_dependent_settings': [ |
41 |
+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |
42 |
+ ], |
43 |
}, { # media_use_ffmpeg == 0 |
44 |
# Exclude the sources that depend on ffmpeg. |
45 |
'sources!': [ |
46 |
--- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000 |
47 |
+++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000 |
48 |
@@ -10,6 +10,8 @@ |
49 |
#include "media/base/video_frame.h" |
50 |
#include "media/base/video_util.h" |
51 |
|
52 |
+#undef SampleFormat |
53 |
+ |
54 |
namespace media { |
55 |
|
56 |
// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are |