]>
Commit | Line | Data |
---|---|---|
7879021e ER |
1 | --- chromium-browser-28.0.1500.20/tools/compile_test/compile_test.py~ 2013-05-25 17:14:51.000000000 +0300 |
2 | +++ chromium-browser-28.0.1500.20/tools/compile_test/compile_test.py 2013-05-25 17:24:02.334165592 +0300 | |
a72846db ER |
3 | @@ -30,7 +30,9 @@ def DoMain(argv): |
4 | if not options.code: | |
5 | parser.error('Missing required --code switch.') | |
6 | ||
7 | - cxx = os.environ.get('CXX', 'g++') | |
8 | + # The environment variable might expand to a string with spaces, | |
9 | + # e.g. "ccache g++". Convert it to a list suitable for argv. | |
10 | + cxx = os.environ.get('CXX', 'g++').split() | |
11 | ||
12 | tmpdir = tempfile.mkdtemp() | |
13 | try: | |
7879021e | 14 | @@ -42,7 +42,7 @@ |
a72846db | 15 | |
2e9c6158 ER |
16 | o_path = os.path.join(tmpdir, 'test.o') |
17 | ||
7879021e ER |
18 | - cxx_cmdline = [cxx, cxx_path, '-o', o_path] |
19 | + cxx_cmdline = cxx + [cxx_path, '-o', o_path] | |
20 | if not options.run_linker: | |
21 | cxx_cmdline.append('-c') | |
22 | # Pass remaining arguments to the compiler. | |
108c5f7c ER |
23 | diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h |
24 | index 17241b9..8a92312 100644 | |
25 | --- a/media/filters/ffmpeg_glue.h | |
26 | +++ b/media/filters/ffmpeg_glue.h | |
27 | @@ -28,9 +28,9 @@ | |
28 | #include "base/basictypes.h" | |
29 | #include "base/memory/scoped_ptr.h" | |
30 | #include "media/base/media_export.h" | |
31 | +#include "media/ffmpeg/ffmpeg_common.h" | |
32 | ||
33 | struct AVFormatContext; | |
34 | -struct AVIOContext; | |
35 | ||
36 | namespace media { | |
37 | ||
2e9c6158 ER |
38 | diff --git a/media/media.gyp b/media/media.gyp |
39 | index df217d2..fde3830 100644 | |
40 | --- a/media/media.gyp | |
41 | +++ b/media/media.gyp | |
42 | @@ -363,6 +363,9 @@ | |
108c5f7c ER |
43 | 'dependencies': [ |
44 | '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', | |
45 | ], | |
46 | + 'export_dependent_settings': [ | |
47 | + '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', | |
48 | + ], | |
40a3ea76 | 49 | }, { # media_use_ffmpeg == 0 |
108c5f7c ER |
50 | # Exclude the sources that depend on ffmpeg. |
51 | 'sources!': [ | |
b0ea35e3 ER |
52 | --- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000 |
53 | +++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000 | |
54 | @@ -10,6 +10,8 @@ | |
55 | #include "media/base/video_frame.h" | |
56 | #include "media/base/video_util.h" | |
57 | ||
58 | +#undef SampleFormat | |
59 | + | |
60 | namespace media { | |
61 | ||
62 | // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are | |
7879021e ER |
63 | --- a/media/media.gyp.orig 2013-05-09 18:02:50.958682676 +0000 |
64 | +++ b/media/media.gyp 2013-05-09 18:03:45.009023680 +0000 | |
65 | @@ -530,6 +530,12 @@ | |
66 | '<!(python <(DEPTH)/tools/compile_test/compile_test.py ' | |
67 | '--code "#define __STDC_CONSTANT_MACROS\n' | |
68 | '#include <libavcodec/avcodec.h>\n' | |
69 | + 'int test() { return AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL; }" ' | |
70 | + '--on-failure -DCHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL=1)', | |
71 | + | |
72 | + '<!(python <(DEPTH)/tools/compile_test/compile_test.py ' | |
73 | + '--code "#define __STDC_CONSTANT_MACROS\n' | |
74 | + '#include <libavcodec/avcodec.h>\n' | |
75 | 'int test() { struct AVFrame frame;\n' | |
76 | 'return av_frame_get_channels(&frame); }" ' | |
77 | '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)', | |
78 | --- a/media/filters/ffmpeg_demuxer.cc.orig 2013-05-09 18:04:25.089276403 +0000 | |
79 | +++ b/media/filters/ffmpeg_demuxer.cc 2013-05-09 18:05:16.289599070 +0000 | |
80 | @@ -111,12 +111,15 @@ | |
81 | // Get side data if any. For now, the only type of side_data is VP8 Alpha. We | |
82 | // keep this generic so that other side_data types in the future can be | |
83 | // handled the same way as well. | |
84 | - av_packet_split_side_data(packet.get()); | |
85 | int side_data_size = 0; | |
86 | - uint8* side_data = av_packet_get_side_data( | |
87 | + uint8* side_data = NULL; | |
88 | +#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL | |
89 | + av_packet_split_side_data(packet.get()); | |
90 | + side_data = av_packet_get_side_data( | |
91 | packet.get(), | |
92 | AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, | |
93 | &side_data_size); | |
94 | +#endif | |
95 | ||
96 | // If a packet is returned by FFmpeg's av_parser_parse2() the packet will | |
97 | // reference inner memory of FFmpeg. As such we should transfer the packet |