| 1 |
phajdan.jr 13/02/27 22:41:02 |
| 2 |
|
| 3 |
Added: chromium-system-ffmpeg-r3.patch |
| 4 |
Log: |
| 5 |
Dev channel bump. |
| 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-r3.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r3.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r3.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: chromium-system-ffmpeg-r3.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 |
}, { # use_ffmpeg == 0 |
| 44 |
# Exclude the sources that depend on ffmpeg. |
| 45 |
'sources!': [ |
| 46 |
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi |
| 47 |
index 81b770c..7b6d673 100644 |
| 48 |
--- a/webkit/media/webkit_media.gypi |
| 49 |
+++ b/webkit/media/webkit_media.gypi |
| 50 |
@@ -24,6 +24,7 @@ |
| 51 |
'dependencies': [ |
| 52 |
'<(DEPTH)/base/base.gyp:base', |
| 53 |
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
| 54 |
+ '<(DEPTH)/media/media.gyp:media', |
| 55 |
'<(DEPTH)/media/media.gyp:shared_memory_support', |
| 56 |
'<(DEPTH)/media/media.gyp:yuv_convert', |
| 57 |
'<(DEPTH)/skia/skia.gyp:skia', |
| 58 |
--- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000 |
| 59 |
+++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000 |
| 60 |
@@ -10,6 +10,8 @@ |
| 61 |
#include "media/base/video_frame.h" |
| 62 |
#include "media/base/video_util.h" |
| 63 |
|
| 64 |
+#undef SampleFormat |
| 65 |
+ |
| 66 |
namespace media { |
| 67 |
|
| 68 |
// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are |
Archives