Lines 1-4
Link Here
|
1 |
--- third_party/ffmpeg/ffmpeg_generated.gni.orig 2016-05-11 19:03:23 UTC |
1 |
--- third_party/ffmpeg/ffmpeg_generated.gni.orig 2016-12-09 05:05:04 UTC |
2 |
+++ third_party/ffmpeg/ffmpeg_generated.gni |
2 |
+++ third_party/ffmpeg/ffmpeg_generated.gni |
3 |
@@ -12,7 +12,7 @@ ffmpeg_c_sources = [] |
3 |
@@ -12,7 +12,7 @@ ffmpeg_c_sources = [] |
4 |
ffmpeg_gas_sources = [] |
4 |
ffmpeg_gas_sources = [] |
Lines 9-15
Link Here
|
9 |
ffmpeg_c_sources += [ |
9 |
ffmpeg_c_sources += [ |
10 |
"libavcodec/allcodecs.c", |
10 |
"libavcodec/allcodecs.c", |
11 |
"libavcodec/autorename_libavcodec_utils.c", |
11 |
"libavcodec/autorename_libavcodec_utils.c", |
12 |
@@ -144,7 +144,7 @@ if ((is_android && current_cpu == "arm" |
12 |
@@ -146,7 +146,7 @@ if ((is_android && current_cpu == "arm" |
13 |
] |
13 |
] |
14 |
} |
14 |
} |
15 |
|
15 |
|
Lines 18-24
Link Here
|
18 |
ffmpeg_c_sources += [ |
18 |
ffmpeg_c_sources += [ |
19 |
"libavcodec/h264pred.c", |
19 |
"libavcodec/h264pred.c", |
20 |
"libavcodec/hpeldsp.c", |
20 |
"libavcodec/hpeldsp.c", |
21 |
@@ -159,13 +159,13 @@ if ((is_linux && current_cpu == "arm" && |
21 |
@@ -161,13 +161,13 @@ if ((is_linux && current_cpu == "arm" && |
22 |
] |
22 |
] |
23 |
} |
23 |
} |
24 |
|
24 |
|
Lines 34-40
Link Here
|
34 |
ffmpeg_c_sources += [ |
34 |
ffmpeg_c_sources += [ |
35 |
"libavcodec/aac_ac3_parser.c", |
35 |
"libavcodec/aac_ac3_parser.c", |
36 |
"libavcodec/aac_parser.c", |
36 |
"libavcodec/aac_parser.c", |
37 |
@@ -207,7 +207,7 @@ if ((is_android && current_cpu == "arm" |
37 |
@@ -209,7 +209,7 @@ if ((is_android && current_cpu == "arm" |
38 |
] |
38 |
] |
39 |
} |
39 |
} |
40 |
|
40 |
|
Lines 43-49
Link Here
|
43 |
ffmpeg_c_sources += [ |
43 |
ffmpeg_c_sources += [ |
44 |
"libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", |
44 |
"libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", |
45 |
"libavcodec/x86/constants.c", |
45 |
"libavcodec/x86/constants.c", |
46 |
@@ -218,7 +218,7 @@ if ((is_android && current_cpu == "x64" |
46 |
@@ -221,7 +221,7 @@ if ((is_android && current_cpu == "x64" |
47 |
] |
47 |
] |
48 |
} |
48 |
} |
49 |
|
49 |
|
Lines 52-58
Link Here
|
52 |
ffmpeg_yasm_sources += [ |
52 |
ffmpeg_yasm_sources += [ |
53 |
"libavcodec/x86/fft.asm", |
53 |
"libavcodec/x86/fft.asm", |
54 |
"libavcodec/x86/vorbisdsp.asm", |
54 |
"libavcodec/x86/vorbisdsp.asm", |
55 |
@@ -228,7 +228,7 @@ if ((is_android && current_cpu == "x64" |
55 |
@@ -232,7 +232,7 @@ if ((is_android && current_cpu == "x64" |
56 |
] |
56 |
] |
57 |
} |
57 |
} |
58 |
|
58 |
|
Lines 61-67
Link Here
|
61 |
ffmpeg_c_sources += [ |
61 |
ffmpeg_c_sources += [ |
62 |
"libavcodec/cabac.c", |
62 |
"libavcodec/cabac.c", |
63 |
"libavcodec/h264.c", |
63 |
"libavcodec/h264.c", |
64 |
@@ -251,7 +251,7 @@ if ((is_linux && current_cpu == "arm" && |
64 |
@@ -255,7 +255,7 @@ if ((is_linux && current_cpu == "arm" && |
65 |
] |
65 |
] |
66 |
} |
66 |
} |
67 |
|
67 |
|
Lines 70-76
Link Here
|
70 |
ffmpeg_c_sources += [ |
70 |
ffmpeg_c_sources += [ |
71 |
"libavcodec/arm/fft_fixed_init_arm.c", |
71 |
"libavcodec/arm/fft_fixed_init_arm.c", |
72 |
"libavcodec/arm/fft_init_arm.c", |
72 |
"libavcodec/arm/fft_init_arm.c", |
73 |
@@ -267,7 +267,7 @@ if ((is_android && current_cpu == "arm" |
73 |
@@ -271,7 +271,7 @@ if ((is_android && current_cpu == "arm" |
74 |
] |
74 |
] |
75 |
} |
75 |
} |
76 |
|
76 |
|
Lines 79-85
Link Here
|
79 |
ffmpeg_c_sources += [ |
79 |
ffmpeg_c_sources += [ |
80 |
"libavcodec/flac.c", |
80 |
"libavcodec/flac.c", |
81 |
"libavcodec/flac_parser.c", |
81 |
"libavcodec/flac_parser.c", |
82 |
@@ -278,7 +278,7 @@ if ((is_linux && current_cpu == "arm" && |
82 |
@@ -282,7 +282,7 @@ if ((is_linux && current_cpu == "arm" && |
83 |
] |
83 |
] |
84 |
} |
84 |
} |
85 |
|
85 |
|
Lines 88-94
Link Here
|
88 |
ffmpeg_c_sources += [ |
88 |
ffmpeg_c_sources += [ |
89 |
"libavcodec/arm/h264pred_init_arm.c", |
89 |
"libavcodec/arm/h264pred_init_arm.c", |
90 |
"libavcodec/arm/hpeldsp_init_arm.c", |
90 |
"libavcodec/arm/hpeldsp_init_arm.c", |
91 |
@@ -298,7 +298,7 @@ if ((is_linux && current_cpu == "arm" && |
91 |
@@ -302,7 +302,7 @@ if ((is_linux && current_cpu == "arm" && |
92 |
] |
92 |
] |
93 |
} |
93 |
} |
94 |
|
94 |
|
Lines 97-103
Link Here
|
97 |
ffmpeg_c_sources += [ |
97 |
ffmpeg_c_sources += [ |
98 |
"libavutil/arm/float_dsp_init_neon.c", |
98 |
"libavutil/arm/float_dsp_init_neon.c", |
99 |
] |
99 |
] |
100 |
@@ -313,7 +313,7 @@ if ((is_android && current_cpu == "arm" |
100 |
@@ -317,7 +317,7 @@ if ((is_android && current_cpu == "arm" |
101 |
] |
101 |
] |
102 |
} |
102 |
} |
103 |
|
103 |
|
Lines 106-112
Link Here
|
106 |
ffmpeg_c_sources += [ |
106 |
ffmpeg_c_sources += [ |
107 |
"libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c", |
107 |
"libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c", |
108 |
"libavcodec/x86/h264_intrapred_init.c", |
108 |
"libavcodec/x86/h264_intrapred_init.c", |
109 |
@@ -333,13 +333,13 @@ if ((is_linux && current_cpu == "x64" && |
109 |
@@ -337,13 +337,13 @@ if ((is_linux && current_cpu == "x64" && |
110 |
] |
110 |
] |
111 |
} |
111 |
} |
112 |
|
112 |
|
Lines 122-128
Link Here
|
122 |
ffmpeg_c_sources += [ |
122 |
ffmpeg_c_sources += [ |
123 |
"libavcodec/x86/aacpsdsp_init.c", |
123 |
"libavcodec/x86/aacpsdsp_init.c", |
124 |
"libavcodec/x86/dct_init.c", |
124 |
"libavcodec/x86/dct_init.c", |
125 |
@@ -348,7 +348,7 @@ if ((is_android && current_cpu == "x64" |
125 |
@@ -352,7 +352,7 @@ if ((is_android && current_cpu == "x64" |
126 |
] |
126 |
] |
127 |
} |
127 |
} |
128 |
|
128 |
|
Lines 131-137
Link Here
|
131 |
ffmpeg_yasm_sources += [ |
131 |
ffmpeg_yasm_sources += [ |
132 |
"libavcodec/x86/aacpsdsp.asm", |
132 |
"libavcodec/x86/aacpsdsp.asm", |
133 |
"libavcodec/x86/dct32.asm", |
133 |
"libavcodec/x86/dct32.asm", |
134 |
@@ -357,7 +357,7 @@ if ((is_android && current_cpu == "x64" |
134 |
@@ -361,7 +361,7 @@ if ((is_android && current_cpu == "x64" |
135 |
] |
135 |
] |
136 |
} |
136 |
} |
137 |
|
137 |
|
Lines 140-146
Link Here
|
140 |
ffmpeg_c_sources += [ |
140 |
ffmpeg_c_sources += [ |
141 |
"libavcodec/arm/aacpsdsp_init_arm.c", |
141 |
"libavcodec/arm/aacpsdsp_init_arm.c", |
142 |
"libavcodec/arm/mpegaudiodsp_init_arm.c", |
142 |
"libavcodec/arm/mpegaudiodsp_init_arm.c", |
143 |
@@ -368,7 +368,7 @@ if ((is_android && current_cpu == "arm" |
143 |
@@ -372,7 +372,7 @@ if ((is_android && current_cpu == "arm" |
144 |
] |
144 |
] |
145 |
} |
145 |
} |
146 |
|
146 |
|
Lines 149-155
Link Here
|
149 |
ffmpeg_c_sources += [ |
149 |
ffmpeg_c_sources += [ |
150 |
"libavcodec/acelp_filters.c", |
150 |
"libavcodec/acelp_filters.c", |
151 |
"libavcodec/acelp_pitch_delay.c", |
151 |
"libavcodec/acelp_pitch_delay.c", |
152 |
@@ -423,7 +423,7 @@ if ((is_linux && current_cpu == "arm" && |
152 |
@@ -427,7 +427,7 @@ if ((is_linux && current_cpu == "arm" && |
153 |
] |
153 |
] |
154 |
} |
154 |
} |
155 |
|
155 |
|
Lines 158-164
Link Here
|
158 |
ffmpeg_c_sources += [ |
158 |
ffmpeg_c_sources += [ |
159 |
"libavcodec/mips/h264pred_init_mips.c", |
159 |
"libavcodec/mips/h264pred_init_mips.c", |
160 |
"libavcodec/mips/hpeldsp_init_mips.c", |
160 |
"libavcodec/mips/hpeldsp_init_mips.c", |
161 |
@@ -431,7 +431,7 @@ if ((is_linux && current_cpu == "mipsel" |
161 |
@@ -435,7 +435,7 @@ if ((is_linux && current_cpu == "mipsel" |
162 |
] |
162 |
] |
163 |
} |
163 |
} |
164 |
|
164 |
|
Lines 167-173
Link Here
|
167 |
ffmpeg_c_sources += [ |
167 |
ffmpeg_c_sources += [ |
168 |
"libavcodec/aarch64/fft_init_aarch64.c", |
168 |
"libavcodec/aarch64/fft_init_aarch64.c", |
169 |
"libavcodec/aarch64/vorbisdsp_init.c", |
169 |
"libavcodec/aarch64/vorbisdsp_init.c", |
170 |
@@ -446,7 +446,7 @@ if ((is_android && current_cpu == "arm64 |
170 |
@@ -450,7 +450,7 @@ if ((is_android && current_cpu == "arm64 |
171 |
] |
171 |
] |
172 |
} |
172 |
} |
173 |
|
173 |
|
Lines 176-182
Link Here
|
176 |
ffmpeg_c_sources += [ |
176 |
ffmpeg_c_sources += [ |
177 |
"libavcodec/aarch64/h264pred_init.c", |
177 |
"libavcodec/aarch64/h264pred_init.c", |
178 |
"libavcodec/aarch64/hpeldsp_init_aarch64.c", |
178 |
"libavcodec/aarch64/hpeldsp_init_aarch64.c", |
179 |
@@ -459,7 +459,7 @@ if ((is_linux && current_cpu == "arm64" |
179 |
@@ -463,7 +463,7 @@ if ((is_linux && current_cpu == "arm64" |
180 |
] |
180 |
] |
181 |
} |
181 |
} |
182 |
|
182 |
|
Lines 185-191
Link Here
|
185 |
ffmpeg_c_sources += [ |
185 |
ffmpeg_c_sources += [ |
186 |
"libavcodec/arm/flacdsp_init_arm.c", |
186 |
"libavcodec/arm/flacdsp_init_arm.c", |
187 |
] |
187 |
] |
188 |
@@ -468,7 +468,7 @@ if ((is_linux && current_cpu == "arm" && |
188 |
@@ -472,7 +472,7 @@ if ((is_linux && current_cpu == "arm" && |
189 |
] |
189 |
] |
190 |
} |
190 |
} |
191 |
|
191 |
|
Lines 194-200
Link Here
|
194 |
ffmpeg_c_sources += [ |
194 |
ffmpeg_c_sources += [ |
195 |
"libavcodec/arm/h264chroma_init_arm.c", |
195 |
"libavcodec/arm/h264chroma_init_arm.c", |
196 |
"libavcodec/arm/h264dsp_init_arm.c", |
196 |
"libavcodec/arm/h264dsp_init_arm.c", |
197 |
@@ -479,7 +479,7 @@ if ((is_linux && current_cpu == "arm" && |
197 |
@@ -483,7 +483,7 @@ if ((is_linux && current_cpu == "arm" && |
198 |
] |
198 |
] |
199 |
} |
199 |
} |
200 |
|
200 |
|
Lines 203-209
Link Here
|
203 |
ffmpeg_c_sources += [ |
203 |
ffmpeg_c_sources += [ |
204 |
"libavcodec/arm/hpeldsp_init_neon.c", |
204 |
"libavcodec/arm/hpeldsp_init_neon.c", |
205 |
"libavcodec/arm/vp8dsp_init_neon.c", |
205 |
"libavcodec/arm/vp8dsp_init_neon.c", |
206 |
@@ -492,14 +492,14 @@ if ((is_linux && current_cpu == "arm" && |
206 |
@@ -496,14 +496,14 @@ if ((is_linux && current_cpu == "arm" && |
207 |
] |
207 |
] |
208 |
} |
208 |
} |
209 |
|
209 |
|
Lines 220-226
Link Here
|
220 |
ffmpeg_c_sources += [ |
220 |
ffmpeg_c_sources += [ |
221 |
"libavcodec/x86/h264_qpel.c", |
221 |
"libavcodec/x86/h264_qpel.c", |
222 |
"libavcodec/x86/h264chroma_init.c", |
222 |
"libavcodec/x86/h264chroma_init.c", |
223 |
@@ -520,7 +520,7 @@ if ((is_linux && current_cpu == "x64" && |
223 |
@@ -524,7 +524,7 @@ if ((is_linux && current_cpu == "x64" && |
224 |
] |
224 |
] |
225 |
} |
225 |
} |
226 |
|
226 |
|
Lines 229-235
Link Here
|
229 |
ffmpeg_c_sources += [ |
229 |
ffmpeg_c_sources += [ |
230 |
"libavcodec/mips/aacdec_mips.c", |
230 |
"libavcodec/mips/aacdec_mips.c", |
231 |
"libavcodec/mips/aacpsdsp_mips.c", |
231 |
"libavcodec/mips/aacpsdsp_mips.c", |
232 |
@@ -529,7 +529,7 @@ if ((is_android && current_cpu == "mips6 |
232 |
@@ -533,7 +533,7 @@ if ((is_android && current_cpu == "mips6 |
233 |
] |
233 |
] |
234 |
} |
234 |
} |
235 |
|
235 |
|
Lines 238-244
Link Here
|
238 |
ffmpeg_c_sources += [ |
238 |
ffmpeg_c_sources += [ |
239 |
"libavcodec/x86/flacdsp_init.c", |
239 |
"libavcodec/x86/flacdsp_init.c", |
240 |
] |
240 |
] |
241 |
@@ -544,7 +544,7 @@ if ((is_win && current_cpu == "x64" && f |
241 |
@@ -548,7 +548,7 @@ if ((is_win && current_cpu == "x64" && f |
242 |
] |
242 |
] |
243 |
} |
243 |
} |
244 |
|
244 |
|
Lines 247-253
Link Here
|
247 |
ffmpeg_c_sources += [ |
247 |
ffmpeg_c_sources += [ |
248 |
"libavcodec/mips/h264chroma_init_mips.c", |
248 |
"libavcodec/mips/h264chroma_init_mips.c", |
249 |
"libavcodec/mips/h264dsp_init_mips.c", |
249 |
"libavcodec/mips/h264dsp_init_mips.c", |
250 |
@@ -552,7 +552,7 @@ if ((is_linux && current_cpu == "mipsel" |
250 |
@@ -556,7 +556,7 @@ if ((is_linux && current_cpu == "mipsel" |
251 |
] |
251 |
] |
252 |
} |
252 |
} |
253 |
|
253 |
|
Lines 256-262
Link Here
|
256 |
ffmpeg_c_sources += [ |
256 |
ffmpeg_c_sources += [ |
257 |
"libavcodec/aarch64/imdct15_init.c", |
257 |
"libavcodec/aarch64/imdct15_init.c", |
258 |
"libavcodec/aarch64/mpegaudiodsp_init.c", |
258 |
"libavcodec/aarch64/mpegaudiodsp_init.c", |
259 |
@@ -563,7 +563,7 @@ if ((is_android && current_cpu == "arm64 |
259 |
@@ -567,7 +567,7 @@ if ((is_android && current_cpu == "arm64 |
260 |
] |
260 |
] |
261 |
} |
261 |
} |
262 |
|
262 |
|
Lines 265-271
Link Here
|
265 |
ffmpeg_c_sources += [ |
265 |
ffmpeg_c_sources += [ |
266 |
"libavcodec/aarch64/h264chroma_init_aarch64.c", |
266 |
"libavcodec/aarch64/h264chroma_init_aarch64.c", |
267 |
"libavcodec/aarch64/h264dsp_init_aarch64.c", |
267 |
"libavcodec/aarch64/h264dsp_init_aarch64.c", |
268 |
@@ -577,7 +577,7 @@ if ((is_linux && current_cpu == "arm64" |
268 |
@@ -581,7 +581,7 @@ if ((is_linux && current_cpu == "arm64" |
269 |
] |
269 |
] |
270 |
} |
270 |
} |
271 |
|
271 |
|
Lines 274-280
Link Here
|
274 |
ffmpeg_c_sources += [ |
274 |
ffmpeg_c_sources += [ |
275 |
"libavcodec/arm/blockdsp_init_arm.c", |
275 |
"libavcodec/arm/blockdsp_init_arm.c", |
276 |
"libavcodec/arm/idctdsp_init_arm.c", |
276 |
"libavcodec/arm/idctdsp_init_arm.c", |
277 |
@@ -601,13 +601,13 @@ if ((is_linux && current_cpu == "arm" && |
277 |
@@ -605,13 +605,13 @@ if ((is_linux && current_cpu == "arm" && |
278 |
] |
278 |
] |
279 |
} |
279 |
} |
280 |
|
280 |
|
Lines 290-296
Link Here
|
290 |
ffmpeg_gas_sources += [ |
290 |
ffmpeg_gas_sources += [ |
291 |
"libavcodec/arm/h264cmc_neon.S", |
291 |
"libavcodec/arm/h264cmc_neon.S", |
292 |
"libavcodec/arm/h264dsp_neon.S", |
292 |
"libavcodec/arm/h264dsp_neon.S", |
293 |
@@ -622,7 +622,7 @@ if ((is_win && current_cpu == "x64" && f |
293 |
@@ -626,7 +626,7 @@ if ((is_win && current_cpu == "x64" && f |
294 |
] |
294 |
] |
295 |
} |
295 |
} |
296 |
|
296 |
|
Lines 299-305
Link Here
|
299 |
ffmpeg_c_sources += [ |
299 |
ffmpeg_c_sources += [ |
300 |
"libavcodec/x86/blockdsp_init.c", |
300 |
"libavcodec/x86/blockdsp_init.c", |
301 |
"libavcodec/x86/fdct.c", |
301 |
"libavcodec/x86/fdct.c", |
302 |
@@ -649,7 +649,7 @@ if ((is_linux && current_cpu == "x64" && |
302 |
@@ -653,7 +653,7 @@ if ((is_linux && current_cpu == "x64" && |
303 |
] |
303 |
] |
304 |
} |
304 |
} |
305 |
|
305 |
|
Lines 308-314
Link Here
|
308 |
ffmpeg_c_sources += [ |
308 |
ffmpeg_c_sources += [ |
309 |
"libavcodec/mips/blockdsp_init_mips.c", |
309 |
"libavcodec/mips/blockdsp_init_mips.c", |
310 |
"libavcodec/mips/h263dsp_init_mips.c", |
310 |
"libavcodec/mips/h263dsp_init_mips.c", |
311 |
@@ -662,7 +662,7 @@ if (is_linux && current_cpu == "mipsel" |
311 |
@@ -666,7 +666,7 @@ if (is_linux && current_cpu == "mipsel" |
312 |
] |
312 |
] |
313 |
} |
313 |
} |
314 |
|
314 |
|