· 6 years ago · Jul 16, 2019, 02:42 PM
1From 466d2ca2b33cc2790fd65ee92d57436c1fcbf191 Mon Sep 17 00:00:00 2001
2From: Anton Mitrofanov <BugMaster@narod.ru>
3Date: Tue, 16 Jul 2019 17:07:30 +0300
4Subject: [PATCH] GPL only version
5
6---
7 autocomplete.c | 3 ---
8 common/aarch64/asm-offsets.c | 3 ---
9 common/aarch64/asm-offsets.h | 3 ---
10 common/aarch64/asm.S | 3 ---
11 common/aarch64/bitstream-a.S | 3 ---
12 common/aarch64/bitstream.h | 3 ---
13 common/aarch64/cabac-a.S | 3 ---
14 common/aarch64/dct-a.S | 3 ---
15 common/aarch64/dct.h | 3 ---
16 common/aarch64/deblock-a.S | 3 ---
17 common/aarch64/deblock.h | 3 ---
18 common/aarch64/mc-a.S | 3 ---
19 common/aarch64/mc-c.c | 3 ---
20 common/aarch64/mc.h | 3 ---
21 common/aarch64/pixel-a.S | 3 ---
22 common/aarch64/pixel.h | 3 ---
23 common/aarch64/predict-a.S | 3 ---
24 common/aarch64/predict-c.c | 3 ---
25 common/aarch64/predict.h | 3 ---
26 common/aarch64/quant-a.S | 3 ---
27 common/aarch64/quant.h | 3 ---
28 common/arm/asm.S | 3 ---
29 common/arm/bitstream-a.S | 3 ---
30 common/arm/bitstream.h | 3 ---
31 common/arm/cpu-a.S | 3 ---
32 common/arm/dct-a.S | 3 ---
33 common/arm/dct.h | 3 ---
34 common/arm/deblock-a.S | 3 ---
35 common/arm/deblock.h | 3 ---
36 common/arm/mc-a.S | 3 ---
37 common/arm/mc-c.c | 3 ---
38 common/arm/mc.h | 3 ---
39 common/arm/pixel-a.S | 3 ---
40 common/arm/pixel.h | 3 ---
41 common/arm/predict-a.S | 3 ---
42 common/arm/predict-c.c | 3 ---
43 common/arm/predict.h | 3 ---
44 common/arm/quant-a.S | 3 ---
45 common/arm/quant.h | 3 ---
46 common/base.c | 3 ---
47 common/base.h | 3 ---
48 common/bitstream.c | 3 ---
49 common/bitstream.h | 3 ---
50 common/cabac.c | 3 ---
51 common/cabac.h | 3 ---
52 common/common.c | 3 ---
53 common/common.h | 3 ---
54 common/cpu.c | 3 ---
55 common/cpu.h | 3 ---
56 common/dct.c | 3 ---
57 common/dct.h | 3 ---
58 common/deblock.c | 3 ---
59 common/frame.c | 3 ---
60 common/frame.h | 3 ---
61 common/macroblock.c | 3 ---
62 common/macroblock.h | 3 ---
63 common/mc.c | 3 ---
64 common/mc.h | 3 ---
65 common/mips/dct-c.c | 3 ---
66 common/mips/dct.h | 3 ---
67 common/mips/deblock-c.c | 3 ---
68 common/mips/deblock.h | 3 ---
69 common/mips/macros.h | 3 ---
70 common/mips/mc-c.c | 3 ---
71 common/mips/mc.h | 3 ---
72 common/mips/pixel-c.c | 3 ---
73 common/mips/pixel.h | 3 ---
74 common/mips/predict-c.c | 3 ---
75 common/mips/predict.h | 3 ---
76 common/mips/quant-c.c | 3 ---
77 common/mips/quant.h | 3 ---
78 common/mvpred.c | 3 ---
79 common/opencl.c | 3 ---
80 common/opencl.h | 3 ---
81 common/osdep.c | 3 ---
82 common/osdep.h | 3 ---
83 common/pixel.c | 3 ---
84 common/pixel.h | 3 ---
85 common/ppc/dct.c | 3 ---
86 common/ppc/dct.h | 3 ---
87 common/ppc/deblock.c | 3 ---
88 common/ppc/deblock.h | 3 ---
89 common/ppc/mc.c | 3 ---
90 common/ppc/mc.h | 3 ---
91 common/ppc/pixel.c | 3 ---
92 common/ppc/pixel.h | 3 ---
93 common/ppc/ppccommon.h | 3 ---
94 common/ppc/predict.c | 3 ---
95 common/ppc/predict.h | 3 ---
96 common/ppc/quant.c | 3 ---
97 common/ppc/quant.h | 3 ---
98 common/predict.c | 3 ---
99 common/predict.h | 3 ---
100 common/quant.c | 3 ---
101 common/quant.h | 3 ---
102 common/rectangle.c | 3 ---
103 common/rectangle.h | 3 ---
104 common/set.c | 3 ---
105 common/set.h | 3 ---
106 common/tables.c | 3 ---
107 common/tables.h | 3 ---
108 common/threadpool.c | 3 ---
109 common/threadpool.h | 3 ---
110 common/vlc.c | 3 ---
111 common/win32thread.c | 3 ---
112 common/win32thread.h | 3 ---
113 common/x86/bitstream-a.asm | 3 ---
114 common/x86/bitstream.h | 3 ---
115 common/x86/cabac-a.asm | 3 ---
116 common/x86/const-a.asm | 3 ---
117 common/x86/cpu-a.asm | 3 ---
118 common/x86/dct-32.asm | 3 ---
119 common/x86/dct-64.asm | 3 ---
120 common/x86/dct-a.asm | 3 ---
121 common/x86/dct.h | 3 ---
122 common/x86/deblock-a.asm | 3 ---
123 common/x86/deblock.h | 3 ---
124 common/x86/mc-a.asm | 3 ---
125 common/x86/mc-a2.asm | 3 ---
126 common/x86/mc-c.c | 3 ---
127 common/x86/mc.h | 3 ---
128 common/x86/pixel-32.asm | 3 ---
129 common/x86/pixel-a.asm | 3 ---
130 common/x86/pixel.h | 3 ---
131 common/x86/predict-a.asm | 3 ---
132 common/x86/predict-c.c | 3 ---
133 common/x86/predict.h | 3 ---
134 common/x86/quant-a.asm | 3 ---
135 common/x86/quant.h | 3 ---
136 common/x86/sad-a.asm | 3 ---
137 common/x86/sad16-a.asm | 3 ---
138 common/x86/trellis-64.asm | 3 ---
139 common/x86/util.h | 3 ---
140 common/x86/x86util.asm | 3 ---
141 configure | 4 ----
142 encoder/analyse.c | 3 ---
143 encoder/analyse.h | 3 ---
144 encoder/api.c | 3 ---
145 encoder/cabac.c | 3 ---
146 encoder/cavlc.c | 3 ---
147 encoder/encoder.c | 3 ---
148 encoder/lookahead.c | 3 ---
149 encoder/macroblock.c | 3 ---
150 encoder/macroblock.h | 3 ---
151 encoder/me.c | 3 ---
152 encoder/me.h | 3 ---
153 encoder/ratecontrol.c | 3 ---
154 encoder/ratecontrol.h | 3 ---
155 encoder/rdo.c | 3 ---
156 encoder/set.c | 7 ++-----
157 encoder/set.h | 3 ---
158 encoder/slicetype-cl.c | 3 ---
159 encoder/slicetype-cl.h | 3 ---
160 encoder/slicetype.c | 3 ---
161 example.c | 3 ---
162 extras/intel_dispatcher.h | 3 ---
163 filters/filters.c | 3 ---
164 filters/filters.h | 3 ---
165 filters/video/cache.c | 3 ---
166 filters/video/crop.c | 3 ---
167 filters/video/depth.c | 3 ---
168 filters/video/fix_vfr_pts.c | 3 ---
169 filters/video/internal.c | 3 ---
170 filters/video/internal.h | 3 ---
171 filters/video/resize.c | 3 ---
172 filters/video/select_every.c | 3 ---
173 filters/video/source.c | 3 ---
174 filters/video/video.c | 3 ---
175 filters/video/video.h | 3 ---
176 input/avs.c | 3 ---
177 input/ffms.c | 3 ---
178 input/input.c | 3 ---
179 input/input.h | 3 ---
180 input/lavf.c | 3 ---
181 input/raw.c | 3 ---
182 input/thread.c | 3 ---
183 input/timecode.c | 3 ---
184 input/y4m.c | 3 ---
185 output/flv.c | 3 ---
186 output/flv_bytestream.c | 3 ---
187 output/flv_bytestream.h | 3 ---
188 output/matroska.c | 3 ---
189 output/matroska_ebml.c | 3 ---
190 output/matroska_ebml.h | 3 ---
191 output/mp4.c | 3 ---
192 output/mp4_lsmash.c | 3 ---
193 output/output.h | 3 ---
194 output/raw.c | 3 ---
195 tools/checkasm-a.asm | 3 ---
196 tools/checkasm-aarch64.S | 3 ---
197 tools/checkasm-arm.S | 3 ---
198 tools/checkasm.c | 3 ---
199 x264.c | 5 +----
200 x264.h | 3 ---
201 x264cli.h | 3 ---
202 x264dll.c | 3 ---
203 x264res.rc | 3 ---
204 197 files changed, 3 insertions(+), 595 deletions(-)
205
206diff --git a/autocomplete.c b/autocomplete.c
207index 37c55845..8ee991b0 100644
208--- a/autocomplete.c
209+++ b/autocomplete.c
210@@ -18,9 +18,6 @@
211 * You should have received a copy of the GNU General Public License
212 * along with this program; if not, write to the Free Software
213 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
214- *
215- * This program is also available under a commercial proprietary license.
216- * For more information, contact us at licensing@x264.com.
217 *****************************************************************************/
218
219 #include "x264cli.h"
220diff --git a/common/aarch64/asm-offsets.c b/common/aarch64/asm-offsets.c
221index 3fe6eb40..303d162e 100644
222--- a/common/aarch64/asm-offsets.c
223+++ b/common/aarch64/asm-offsets.c
224@@ -18,9 +18,6 @@
225 * You should have received a copy of the GNU General Public License
226 * along with this program; if not, write to the Free Software
227 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
228- *
229- * This program is also available under a commercial proprietary license.
230- * For more information, contact us at licensing@x264.com.
231 *****************************************************************************/
232
233 #include "common/common.h"
234diff --git a/common/aarch64/asm-offsets.h b/common/aarch64/asm-offsets.h
235index 9ab0f0f3..c9816274 100644
236--- a/common/aarch64/asm-offsets.h
237+++ b/common/aarch64/asm-offsets.h
238@@ -18,9 +18,6 @@
239 * You should have received a copy of the GNU General Public License
240 * along with this program; if not, write to the Free Software
241 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
242- *
243- * This program is also available under a commercial proprietary license.
244- * For more information, contact us at licensing@x264.com.
245 *****************************************************************************/
246
247 #ifndef X264_AARCH64_ASM_OFFSETS_H
248diff --git a/common/aarch64/asm.S b/common/aarch64/asm.S
249index 40dfb1a5..3d128349 100644
250--- a/common/aarch64/asm.S
251+++ b/common/aarch64/asm.S
252@@ -20,9 +20,6 @@
253 * You should have received a copy of the GNU General Public License
254 * along with this program; if not, write to the Free Software
255 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
256- *
257- * This program is also available under a commercial proprietary license.
258- * For more information, contact us at licensing@x264.com.
259 *****************************************************************************/
260
261 #include "config.h"
262diff --git a/common/aarch64/bitstream-a.S b/common/aarch64/bitstream-a.S
263index b8b0a5e7..09c12b1d 100644
264--- a/common/aarch64/bitstream-a.S
265+++ b/common/aarch64/bitstream-a.S
266@@ -18,9 +18,6 @@
267 * You should have received a copy of the GNU General Public License
268 * along with this program; if not, write to the Free Software
269 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
270- *
271- * This program is also available under a commercial proprietary license.
272- * For more information, contact us at licensing@x264.com.
273 *****************************************************************************/
274
275 #include "asm.S"
276diff --git a/common/aarch64/bitstream.h b/common/aarch64/bitstream.h
277index 483e0f1a..c5785484 100644
278--- a/common/aarch64/bitstream.h
279+++ b/common/aarch64/bitstream.h
280@@ -18,9 +18,6 @@
281 * You should have received a copy of the GNU General Public License
282 * along with this program; if not, write to the Free Software
283 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
284- *
285- * This program is also available under a commercial proprietary license.
286- * For more information, contact us at licensing@x264.com.
287 *****************************************************************************/
288
289 #ifndef X264_AARCH64_BITSTREAM_H
290diff --git a/common/aarch64/cabac-a.S b/common/aarch64/cabac-a.S
291index d45bb815..8f276372 100644
292--- a/common/aarch64/cabac-a.S
293+++ b/common/aarch64/cabac-a.S
294@@ -18,9 +18,6 @@
295 * You should have received a copy of the GNU General Public License
296 * along with this program; if not, write to the Free Software
297 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
298- *
299- * This program is also available under a commercial proprietary license.
300- * For more information, contact us at licensing@x264.com.
301 *****************************************************************************/
302
303 #include "asm.S"
304diff --git a/common/aarch64/dct-a.S b/common/aarch64/dct-a.S
305index bcaf7f44..5d9d6642 100644
306--- a/common/aarch64/dct-a.S
307+++ b/common/aarch64/dct-a.S
308@@ -19,9 +19,6 @@
309 * You should have received a copy of the GNU General Public License
310 * along with this program; if not, write to the Free Software
311 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
312- *
313- * This program is also available under a commercial proprietary license.
314- * For more information, contact us at licensing@x264.com.
315 *****************************************************************************/
316
317 #include "asm.S"
318diff --git a/common/aarch64/dct.h b/common/aarch64/dct.h
319index 5ddc9dad..537d82c3 100644
320--- a/common/aarch64/dct.h
321+++ b/common/aarch64/dct.h
322@@ -19,9 +19,6 @@
323 * You should have received a copy of the GNU General Public License
324 * along with this program; if not, write to the Free Software
325 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
326- *
327- * This program is also available under a commercial proprietary license.
328- * For more information, contact us at licensing@x264.com.
329 *****************************************************************************/
330
331 #ifndef X264_AARCH64_DCT_H
332diff --git a/common/aarch64/deblock-a.S b/common/aarch64/deblock-a.S
333index 158909df..edfc8c15 100644
334--- a/common/aarch64/deblock-a.S
335+++ b/common/aarch64/deblock-a.S
336@@ -19,9 +19,6 @@
337 * You should have received a copy of the GNU General Public License
338 * along with this program; if not, write to the Free Software
339 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
340- *
341- * This program is also available under a commercial proprietary license.
342- * For more information, contact us at licensing@x264.com.
343 *****************************************************************************/
344
345 #include "asm.S"
346diff --git a/common/aarch64/deblock.h b/common/aarch64/deblock.h
347index ca41f1c0..bff6933f 100644
348--- a/common/aarch64/deblock.h
349+++ b/common/aarch64/deblock.h
350@@ -18,9 +18,6 @@
351 * You should have received a copy of the GNU General Public License
352 * along with this program; if not, write to the Free Software
353 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
354- *
355- * This program is also available under a commercial proprietary license.
356- * For more information, contact us at licensing@x264.com.
357 *****************************************************************************/
358
359 #ifndef X264_AARCH64_DEBLOCK_H
360diff --git a/common/aarch64/mc-a.S b/common/aarch64/mc-a.S
361index 0d172db7..bfc3d399 100644
362--- a/common/aarch64/mc-a.S
363+++ b/common/aarch64/mc-a.S
364@@ -21,9 +21,6 @@
365 * You should have received a copy of the GNU General Public License
366 * along with this program; if not, write to the Free Software
367 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
368- *
369- * This program is also available under a commercial proprietary license.
370- * For more information, contact us at licensing@x264.com.
371 *****************************************************************************/
372
373 #include "asm.S"
374diff --git a/common/aarch64/mc-c.c b/common/aarch64/mc-c.c
375index 6aad85ed..330e047a 100644
376--- a/common/aarch64/mc-c.c
377+++ b/common/aarch64/mc-c.c
378@@ -19,9 +19,6 @@
379 * You should have received a copy of the GNU General Public License
380 * along with this program; if not, write to the Free Software
381 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
382- *
383- * This program is also available under a commercial proprietary license.
384- * For more information, contact us at licensing@x264.com.
385 *****************************************************************************/
386
387 #include "common/common.h"
388diff --git a/common/aarch64/mc.h b/common/aarch64/mc.h
389index 774e6e49..d72b3bdc 100644
390--- a/common/aarch64/mc.h
391+++ b/common/aarch64/mc.h
392@@ -18,9 +18,6 @@
393 * You should have received a copy of the GNU General Public License
394 * along with this program; if not, write to the Free Software
395 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
396- *
397- * This program is also available under a commercial proprietary license.
398- * For more information, contact us at licensing@x264.com.
399 *****************************************************************************/
400
401 #ifndef X264_AARCH64_MC_H
402diff --git a/common/aarch64/pixel-a.S b/common/aarch64/pixel-a.S
403index 7d7c39f1..fbd9d89e 100644
404--- a/common/aarch64/pixel-a.S
405+++ b/common/aarch64/pixel-a.S
406@@ -19,9 +19,6 @@
407 * You should have received a copy of the GNU General Public License
408 * along with this program; if not, write to the Free Software
409 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
410- *
411- * This program is also available under a commercial proprietary license.
412- * For more information, contact us at licensing@x264.com.
413 *****************************************************************************/
414
415 #include "asm.S"
416diff --git a/common/aarch64/pixel.h b/common/aarch64/pixel.h
417index 0937ed16..1b7dec9c 100644
418--- a/common/aarch64/pixel.h
419+++ b/common/aarch64/pixel.h
420@@ -19,9 +19,6 @@
421 * You should have received a copy of the GNU General Public License
422 * along with this program; if not, write to the Free Software
423 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
424- *
425- * This program is also available under a commercial proprietary license.
426- * For more information, contact us at licensing@x264.com.
427 *****************************************************************************/
428
429 #ifndef X264_AARCH64_PIXEL_H
430diff --git a/common/aarch64/predict-a.S b/common/aarch64/predict-a.S
431index c7fca3d4..c5b58a14 100644
432--- a/common/aarch64/predict-a.S
433+++ b/common/aarch64/predict-a.S
434@@ -20,9 +20,6 @@
435 * You should have received a copy of the GNU General Public License
436 * along with this program; if not, write to the Free Software
437 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
438- *
439- * This program is also available under a commercial proprietary license.
440- * For more information, contact us at licensing@x264.com.
441 *****************************************************************************/
442
443 #include "asm.S"
444diff --git a/common/aarch64/predict-c.c b/common/aarch64/predict-c.c
445index 283f6798..a3f8367c 100644
446--- a/common/aarch64/predict-c.c
447+++ b/common/aarch64/predict-c.c
448@@ -19,9 +19,6 @@
449 * You should have received a copy of the GNU General Public License
450 * along with this program; if not, write to the Free Software
451 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
452- *
453- * This program is also available under a commercial proprietary license.
454- * For more information, contact us at licensing@x264.com.
455 *****************************************************************************/
456
457 #include "common/common.h"
458diff --git a/common/aarch64/predict.h b/common/aarch64/predict.h
459index f1913623..419160a3 100644
460--- a/common/aarch64/predict.h
461+++ b/common/aarch64/predict.h
462@@ -19,9 +19,6 @@
463 * You should have received a copy of the GNU General Public License
464 * along with this program; if not, write to the Free Software
465 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
466- *
467- * This program is also available under a commercial proprietary license.
468- * For more information, contact us at licensing@x264.com.
469 *****************************************************************************/
470
471 #ifndef X264_AARCH64_PREDICT_H
472diff --git a/common/aarch64/quant-a.S b/common/aarch64/quant-a.S
473index 4e295477..1fe2cfd0 100644
474--- a/common/aarch64/quant-a.S
475+++ b/common/aarch64/quant-a.S
476@@ -20,9 +20,6 @@
477 * You should have received a copy of the GNU General Public License
478 * along with this program; if not, write to the Free Software
479 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
480- *
481- * This program is also available under a commercial proprietary license.
482- * For more information, contact us at licensing@x264.com.
483 *****************************************************************************/
484
485 #include "asm.S"
486diff --git a/common/aarch64/quant.h b/common/aarch64/quant.h
487index 308092be..54114c41 100644
488--- a/common/aarch64/quant.h
489+++ b/common/aarch64/quant.h
490@@ -19,9 +19,6 @@
491 * You should have received a copy of the GNU General Public License
492 * along with this program; if not, write to the Free Software
493 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
494- *
495- * This program is also available under a commercial proprietary license.
496- * For more information, contact us at licensing@x264.com.
497 *****************************************************************************/
498
499 #ifndef X264_AARCH64_QUANT_H
500diff --git a/common/arm/asm.S b/common/arm/asm.S
501index 79748c76..cabec932 100644
502--- a/common/arm/asm.S
503+++ b/common/arm/asm.S
504@@ -19,9 +19,6 @@
505 * You should have received a copy of the GNU General Public License
506 * along with this program; if not, write to the Free Software
507 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
508- *
509- * This program is also available under a commercial proprietary license.
510- * For more information, contact us at licensing@x264.com.
511 *****************************************************************************/
512
513 #include "config.h"
514diff --git a/common/arm/bitstream-a.S b/common/arm/bitstream-a.S
515index 0031141c..b4440346 100644
516--- a/common/arm/bitstream-a.S
517+++ b/common/arm/bitstream-a.S
518@@ -18,9 +18,6 @@
519 * You should have received a copy of the GNU General Public License
520 * along with this program; if not, write to the Free Software
521 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
522- *
523- * This program is also available under a commercial proprietary license.
524- * For more information, contact us at licensing@x264.com.
525 *****************************************************************************/
526
527 #include "asm.S"
528diff --git a/common/arm/bitstream.h b/common/arm/bitstream.h
529index 000d3bc4..c0ac0536 100644
530--- a/common/arm/bitstream.h
531+++ b/common/arm/bitstream.h
532@@ -18,9 +18,6 @@
533 * You should have received a copy of the GNU General Public License
534 * along with this program; if not, write to the Free Software
535 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
536- *
537- * This program is also available under a commercial proprietary license.
538- * For more information, contact us at licensing@x264.com.
539 *****************************************************************************/
540
541 #ifndef X264_ARM_BITSTREAM_H
542diff --git a/common/arm/cpu-a.S b/common/arm/cpu-a.S
543index a24c9b4a..b867df8a 100644
544--- a/common/arm/cpu-a.S
545+++ b/common/arm/cpu-a.S
546@@ -18,9 +18,6 @@
547 * You should have received a copy of the GNU General Public License
548 * along with this program; if not, write to the Free Software
549 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
550- *
551- * This program is also available under a commercial proprietary license.
552- * For more information, contact us at licensing@x264.com.
553 *****************************************************************************/
554
555 #include "asm.S"
556diff --git a/common/arm/dct-a.S b/common/arm/dct-a.S
557index c0caa2c3..a0dea080 100644
558--- a/common/arm/dct-a.S
559+++ b/common/arm/dct-a.S
560@@ -19,9 +19,6 @@
561 * You should have received a copy of the GNU General Public License
562 * along with this program; if not, write to the Free Software
563 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
564- *
565- * This program is also available under a commercial proprietary license.
566- * For more information, contact us at licensing@x264.com.
567 *****************************************************************************/
568
569 #include "asm.S"
570diff --git a/common/arm/dct.h b/common/arm/dct.h
571index ac81c9e5..5711d4e8 100644
572--- a/common/arm/dct.h
573+++ b/common/arm/dct.h
574@@ -18,9 +18,6 @@
575 * You should have received a copy of the GNU General Public License
576 * along with this program; if not, write to the Free Software
577 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
578- *
579- * This program is also available under a commercial proprietary license.
580- * For more information, contact us at licensing@x264.com.
581 *****************************************************************************/
582
583 #ifndef X264_ARM_DCT_H
584diff --git a/common/arm/deblock-a.S b/common/arm/deblock-a.S
585index 218741e8..b7c3f612 100644
586--- a/common/arm/deblock-a.S
587+++ b/common/arm/deblock-a.S
588@@ -19,9 +19,6 @@
589 * You should have received a copy of the GNU General Public License
590 * along with this program; if not, write to the Free Software
591 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
592- *
593- * This program is also available under a commercial proprietary license.
594- * For more information, contact us at licensing@x264.com.
595 *****************************************************************************/
596
597 #include "asm.S"
598diff --git a/common/arm/deblock.h b/common/arm/deblock.h
599index af25e9ce..b469dc3c 100644
600--- a/common/arm/deblock.h
601+++ b/common/arm/deblock.h
602@@ -18,9 +18,6 @@
603 * You should have received a copy of the GNU General Public License
604 * along with this program; if not, write to the Free Software
605 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
606- *
607- * This program is also available under a commercial proprietary license.
608- * For more information, contact us at licensing@x264.com.
609 *****************************************************************************/
610
611 #ifndef X264_ARM_DEBLOCK_H
612diff --git a/common/arm/mc-a.S b/common/arm/mc-a.S
613index 1c32fbc0..89ebca0a 100644
614--- a/common/arm/mc-a.S
615+++ b/common/arm/mc-a.S
616@@ -21,9 +21,6 @@
617 * You should have received a copy of the GNU General Public License
618 * along with this program; if not, write to the Free Software
619 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
620- *
621- * This program is also available under a commercial proprietary license.
622- * For more information, contact us at licensing@x264.com.
623 *****************************************************************************/
624
625 #include "asm.S"
626diff --git a/common/arm/mc-c.c b/common/arm/mc-c.c
627index d31b239a..e6d752bb 100644
628--- a/common/arm/mc-c.c
629+++ b/common/arm/mc-c.c
630@@ -19,9 +19,6 @@
631 * You should have received a copy of the GNU General Public License
632 * along with this program; if not, write to the Free Software
633 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
634- *
635- * This program is also available under a commercial proprietary license.
636- * For more information, contact us at licensing@x264.com.
637 *****************************************************************************/
638
639 #include "common/common.h"
640diff --git a/common/arm/mc.h b/common/arm/mc.h
641index f0d77644..4ed18584 100644
642--- a/common/arm/mc.h
643+++ b/common/arm/mc.h
644@@ -18,9 +18,6 @@
645 * You should have received a copy of the GNU General Public License
646 * along with this program; if not, write to the Free Software
647 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
648- *
649- * This program is also available under a commercial proprietary license.
650- * For more information, contact us at licensing@x264.com.
651 *****************************************************************************/
652
653 #ifndef X264_ARM_MC_H
654diff --git a/common/arm/pixel-a.S b/common/arm/pixel-a.S
655index 757f2f08..87cf4f1a 100644
656--- a/common/arm/pixel-a.S
657+++ b/common/arm/pixel-a.S
658@@ -19,9 +19,6 @@
659 * You should have received a copy of the GNU General Public License
660 * along with this program; if not, write to the Free Software
661 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
662- *
663- * This program is also available under a commercial proprietary license.
664- * For more information, contact us at licensing@x264.com.
665 *****************************************************************************/
666
667 #include "asm.S"
668diff --git a/common/arm/pixel.h b/common/arm/pixel.h
669index 842cf16b..9d09a269 100644
670--- a/common/arm/pixel.h
671+++ b/common/arm/pixel.h
672@@ -18,9 +18,6 @@
673 * You should have received a copy of the GNU General Public License
674 * along with this program; if not, write to the Free Software
675 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
676- *
677- * This program is also available under a commercial proprietary license.
678- * For more information, contact us at licensing@x264.com.
679 *****************************************************************************/
680
681 #ifndef X264_ARM_PIXEL_H
682diff --git a/common/arm/predict-a.S b/common/arm/predict-a.S
683index b263552b..808cbff9 100644
684--- a/common/arm/predict-a.S
685+++ b/common/arm/predict-a.S
686@@ -20,9 +20,6 @@
687 * You should have received a copy of the GNU General Public License
688 * along with this program; if not, write to the Free Software
689 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
690- *
691- * This program is also available under a commercial proprietary license.
692- * For more information, contact us at licensing@x264.com.
693 *****************************************************************************/
694
695 #include "asm.S"
696diff --git a/common/arm/predict-c.c b/common/arm/predict-c.c
697index a416c1ae..89c4dbbc 100644
698--- a/common/arm/predict-c.c
699+++ b/common/arm/predict-c.c
700@@ -18,9 +18,6 @@
701 * You should have received a copy of the GNU General Public License
702 * along with this program; if not, write to the Free Software
703 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
704- *
705- * This program is also available under a commercial proprietary license.
706- * For more information, contact us at licensing@x264.com.
707 *****************************************************************************/
708
709 #include "common/common.h"
710diff --git a/common/arm/predict.h b/common/arm/predict.h
711index 1c426ebf..975a2a26 100644
712--- a/common/arm/predict.h
713+++ b/common/arm/predict.h
714@@ -18,9 +18,6 @@
715 * You should have received a copy of the GNU General Public License
716 * along with this program; if not, write to the Free Software
717 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
718- *
719- * This program is also available under a commercial proprietary license.
720- * For more information, contact us at licensing@x264.com.
721 *****************************************************************************/
722
723 #ifndef X264_ARM_PREDICT_H
724diff --git a/common/arm/quant-a.S b/common/arm/quant-a.S
725index 9b2b2799..e90da084 100644
726--- a/common/arm/quant-a.S
727+++ b/common/arm/quant-a.S
728@@ -19,9 +19,6 @@
729 * You should have received a copy of the GNU General Public License
730 * along with this program; if not, write to the Free Software
731 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
732- *
733- * This program is also available under a commercial proprietary license.
734- * For more information, contact us at licensing@x264.com.
735 *****************************************************************************/
736
737 #include "asm.S"
738diff --git a/common/arm/quant.h b/common/arm/quant.h
739index 73a889d9..593d441b 100644
740--- a/common/arm/quant.h
741+++ b/common/arm/quant.h
742@@ -18,9 +18,6 @@
743 * You should have received a copy of the GNU General Public License
744 * along with this program; if not, write to the Free Software
745 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
746- *
747- * This program is also available under a commercial proprietary license.
748- * For more information, contact us at licensing@x264.com.
749 *****************************************************************************/
750
751 #ifndef X264_ARM_QUANT_H
752diff --git a/common/base.c b/common/base.c
753index a637cff5..f35fb9fe 100644
754--- a/common/base.c
755+++ b/common/base.c
756@@ -19,9 +19,6 @@
757 * You should have received a copy of the GNU General Public License
758 * along with this program; if not, write to the Free Software
759 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
760- *
761- * This program is also available under a commercial proprietary license.
762- * For more information, contact us at licensing@x264.com.
763 *****************************************************************************/
764
765 #include "base.h"
766diff --git a/common/base.h b/common/base.h
767index 4cb389a0..599ec3fa 100644
768--- a/common/base.h
769+++ b/common/base.h
770@@ -19,9 +19,6 @@
771 * You should have received a copy of the GNU General Public License
772 * along with this program; if not, write to the Free Software
773 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
774- *
775- * This program is also available under a commercial proprietary license.
776- * For more information, contact us at licensing@x264.com.
777 *****************************************************************************/
778
779 #ifndef X264_BASE_H
780diff --git a/common/bitstream.c b/common/bitstream.c
781index bd7e7e75..d48ff669 100644
782--- a/common/bitstream.c
783+++ b/common/bitstream.c
784@@ -19,9 +19,6 @@
785 * You should have received a copy of the GNU General Public License
786 * along with this program; if not, write to the Free Software
787 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
788- *
789- * This program is also available under a commercial proprietary license.
790- * For more information, contact us at licensing@x264.com.
791 *****************************************************************************/
792
793 #include "common.h"
794diff --git a/common/bitstream.h b/common/bitstream.h
795index 32a967dd..02205445 100644
796--- a/common/bitstream.h
797+++ b/common/bitstream.h
798@@ -20,9 +20,6 @@
799 * You should have received a copy of the GNU General Public License
800 * along with this program; if not, write to the Free Software
801 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
802- *
803- * This program is also available under a commercial proprietary license.
804- * For more information, contact us at licensing@x264.com.
805 *****************************************************************************/
806
807 #ifndef X264_BS_H
808diff --git a/common/cabac.c b/common/cabac.c
809index dcee8ae2..90424ecb 100644
810--- a/common/cabac.c
811+++ b/common/cabac.c
812@@ -20,9 +20,6 @@
813 * You should have received a copy of the GNU General Public License
814 * along with this program; if not, write to the Free Software
815 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
816- *
817- * This program is also available under a commercial proprietary license.
818- * For more information, contact us at licensing@x264.com.
819 *****************************************************************************/
820
821 #include "common.h"
822diff --git a/common/cabac.h b/common/cabac.h
823index 8b4d9301..a95b6270 100644
824--- a/common/cabac.h
825+++ b/common/cabac.h
826@@ -19,9 +19,6 @@
827 * You should have received a copy of the GNU General Public License
828 * along with this program; if not, write to the Free Software
829 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
830- *
831- * This program is also available under a commercial proprietary license.
832- * For more information, contact us at licensing@x264.com.
833 *****************************************************************************/
834
835 #ifndef X264_CABAC_H
836diff --git a/common/common.c b/common/common.c
837index 17a33474..0601fd2b 100644
838--- a/common/common.c
839+++ b/common/common.c
840@@ -19,9 +19,6 @@
841 * You should have received a copy of the GNU General Public License
842 * along with this program; if not, write to the Free Software
843 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
844- *
845- * This program is also available under a commercial proprietary license.
846- * For more information, contact us at licensing@x264.com.
847 *****************************************************************************/
848
849 #include "common.h"
850diff --git a/common/common.h b/common/common.h
851index a167df63..1efddf44 100644
852--- a/common/common.h
853+++ b/common/common.h
854@@ -19,9 +19,6 @@
855 * You should have received a copy of the GNU General Public License
856 * along with this program; if not, write to the Free Software
857 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
858- *
859- * This program is also available under a commercial proprietary license.
860- * For more information, contact us at licensing@x264.com.
861 *****************************************************************************/
862
863 #ifndef X264_COMMON_H
864diff --git a/common/cpu.c b/common/cpu.c
865index 063d148e..94dc97dd 100644
866--- a/common/cpu.c
867+++ b/common/cpu.c
868@@ -20,9 +20,6 @@
869 * You should have received a copy of the GNU General Public License
870 * along with this program; if not, write to the Free Software
871 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
872- *
873- * This program is also available under a commercial proprietary license.
874- * For more information, contact us at licensing@x264.com.
875 *****************************************************************************/
876
877 #include "base.h"
878diff --git a/common/cpu.h b/common/cpu.h
879index 0a1cdb6c..a5467def 100644
880--- a/common/cpu.h
881+++ b/common/cpu.h
882@@ -18,9 +18,6 @@
883 * You should have received a copy of the GNU General Public License
884 * along with this program; if not, write to the Free Software
885 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
886- *
887- * This program is also available under a commercial proprietary license.
888- * For more information, contact us at licensing@x264.com.
889 *****************************************************************************/
890
891 #ifndef X264_CPU_H
892diff --git a/common/dct.c b/common/dct.c
893index 5d1ea75f..e57d33db 100644
894--- a/common/dct.c
895+++ b/common/dct.c
896@@ -20,9 +20,6 @@
897 * You should have received a copy of the GNU General Public License
898 * along with this program; if not, write to the Free Software
899 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
900- *
901- * This program is also available under a commercial proprietary license.
902- * For more information, contact us at licensing@x264.com.
903 *****************************************************************************/
904
905 #include "common.h"
906diff --git a/common/dct.h b/common/dct.h
907index ee0c01bb..d07c1efa 100644
908--- a/common/dct.h
909+++ b/common/dct.h
910@@ -18,9 +18,6 @@
911 * You should have received a copy of the GNU General Public License
912 * along with this program; if not, write to the Free Software
913 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
914- *
915- * This program is also available under a commercial proprietary license.
916- * For more information, contact us at licensing@x264.com.
917 *****************************************************************************/
918
919 #ifndef X264_DCT_H
920diff --git a/common/deblock.c b/common/deblock.c
921index f887b51a..80d92c31 100644
922--- a/common/deblock.c
923+++ b/common/deblock.c
924@@ -21,9 +21,6 @@
925 * You should have received a copy of the GNU General Public License
926 * along with this program; if not, write to the Free Software
927 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
928- *
929- * This program is also available under a commercial proprietary license.
930- * For more information, contact us at licensing@x264.com.
931 *****************************************************************************/
932
933 #include "common.h"
934diff --git a/common/frame.c b/common/frame.c
935index d2e36c77..20bf6d62 100644
936--- a/common/frame.c
937+++ b/common/frame.c
938@@ -20,9 +20,6 @@
939 * You should have received a copy of the GNU General Public License
940 * along with this program; if not, write to the Free Software
941 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
942- *
943- * This program is also available under a commercial proprietary license.
944- * For more information, contact us at licensing@x264.com.
945 *****************************************************************************/
946
947 #include "common.h"
948diff --git a/common/frame.h b/common/frame.h
949index 3b65e484..740d27d1 100644
950--- a/common/frame.h
951+++ b/common/frame.h
952@@ -20,9 +20,6 @@
953 * You should have received a copy of the GNU General Public License
954 * along with this program; if not, write to the Free Software
955 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
956- *
957- * This program is also available under a commercial proprietary license.
958- * For more information, contact us at licensing@x264.com.
959 *****************************************************************************/
960
961 #ifndef X264_FRAME_H
962diff --git a/common/macroblock.c b/common/macroblock.c
963index c43c16dc..65cf6ddc 100644
964--- a/common/macroblock.c
965+++ b/common/macroblock.c
966@@ -21,9 +21,6 @@
967 * You should have received a copy of the GNU General Public License
968 * along with this program; if not, write to the Free Software
969 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
970- *
971- * This program is also available under a commercial proprietary license.
972- * For more information, contact us at licensing@x264.com.
973 *****************************************************************************/
974
975 #include "common.h"
976diff --git a/common/macroblock.h b/common/macroblock.h
977index 2d566cfe..ba089095 100644
978--- a/common/macroblock.h
979+++ b/common/macroblock.h
980@@ -20,9 +20,6 @@
981 * You should have received a copy of the GNU General Public License
982 * along with this program; if not, write to the Free Software
983 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
984- *
985- * This program is also available under a commercial proprietary license.
986- * For more information, contact us at licensing@x264.com.
987 *****************************************************************************/
988
989 #ifndef X264_MACROBLOCK_H
990diff --git a/common/mc.c b/common/mc.c
991index f2a49a9c..7d658493 100644
992--- a/common/mc.c
993+++ b/common/mc.c
994@@ -19,9 +19,6 @@
995 * You should have received a copy of the GNU General Public License
996 * along with this program; if not, write to the Free Software
997 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
998- *
999- * This program is also available under a commercial proprietary license.
1000- * For more information, contact us at licensing@x264.com.
1001 *****************************************************************************/
1002
1003 #include "common.h"
1004diff --git a/common/mc.h b/common/mc.h
1005index 4abae7f8..0838dd8d 100644
1006--- a/common/mc.h
1007+++ b/common/mc.h
1008@@ -18,9 +18,6 @@
1009 * You should have received a copy of the GNU General Public License
1010 * along with this program; if not, write to the Free Software
1011 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1012- *
1013- * This program is also available under a commercial proprietary license.
1014- * For more information, contact us at licensing@x264.com.
1015 *****************************************************************************/
1016
1017 #ifndef X264_MC_H
1018diff --git a/common/mips/dct-c.c b/common/mips/dct-c.c
1019index f4b11d16..2c6fdb67 100644
1020--- a/common/mips/dct-c.c
1021+++ b/common/mips/dct-c.c
1022@@ -18,9 +18,6 @@
1023 * You should have received a copy of the GNU General Public License
1024 * along with this program; if not, write to the Free Software
1025 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1026- *
1027- * This program is also available under a commercial proprietary license.
1028- * For more information, contact us at licensing@x264.com.
1029 *****************************************************************************/
1030
1031 #include "common/common.h"
1032diff --git a/common/mips/dct.h b/common/mips/dct.h
1033index 5cec8079..6028ee2c 100644
1034--- a/common/mips/dct.h
1035+++ b/common/mips/dct.h
1036@@ -18,9 +18,6 @@
1037 * You should have received a copy of the GNU General Public License
1038 * along with this program; if not, write to the Free Software
1039 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1040- *
1041- * This program is also available under a commercial proprietary license.
1042- * For more information, contact us at licensing@x264.com.
1043 *****************************************************************************/
1044
1045 #ifndef X264_MIPS_DCT_H
1046diff --git a/common/mips/deblock-c.c b/common/mips/deblock-c.c
1047index 3fd71ecc..43f2b25d 100644
1048--- a/common/mips/deblock-c.c
1049+++ b/common/mips/deblock-c.c
1050@@ -18,9 +18,6 @@
1051 * You should have received a copy of the GNU General Public License
1052 * along with this program; if not, write to the Free Software
1053 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1054- *
1055- * This program is also available under a commercial proprietary license.
1056- * For more information, contact us at licensing@x264.com.
1057 *****************************************************************************/
1058
1059 #include "common/common.h"
1060diff --git a/common/mips/deblock.h b/common/mips/deblock.h
1061index d48373c8..7787520c 100644
1062--- a/common/mips/deblock.h
1063+++ b/common/mips/deblock.h
1064@@ -18,9 +18,6 @@
1065 * You should have received a copy of the GNU General Public License
1066 * along with this program; if not, write to the Free Software
1067 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1068- *
1069- * This program is also available under a commercial proprietary license.
1070- * For more information, contact us at licensing@x264.com.
1071 *****************************************************************************/
1072
1073 #ifndef X264_MIPS_DEBLOCK_H
1074diff --git a/common/mips/macros.h b/common/mips/macros.h
1075index 108519bc..9cff9aa9 100644
1076--- a/common/mips/macros.h
1077+++ b/common/mips/macros.h
1078@@ -18,9 +18,6 @@
1079 * You should have received a copy of the GNU General Public License
1080 * along with this program; if not, write to the Free Software
1081 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1082- *
1083- * This program is also available under a commercial proprietary license.
1084- * For more information, contact us at licensing@x264.com.
1085 *****************************************************************************/
1086
1087 #ifndef X264_MIPS_MACROS_H
1088diff --git a/common/mips/mc-c.c b/common/mips/mc-c.c
1089index a8c090a8..f44350ad 100644
1090--- a/common/mips/mc-c.c
1091+++ b/common/mips/mc-c.c
1092@@ -18,9 +18,6 @@
1093 * You should have received a copy of the GNU General Public License
1094 * along with this program; if not, write to the Free Software
1095 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1096- *
1097- * This program is also available under a commercial proprietary license.
1098- * For more information, contact us at licensing@x264.com.
1099 *****************************************************************************/
1100
1101 #include "common/common.h"
1102diff --git a/common/mips/mc.h b/common/mips/mc.h
1103index 614ce868..93440716 100644
1104--- a/common/mips/mc.h
1105+++ b/common/mips/mc.h
1106@@ -18,9 +18,6 @@
1107 * You should have received a copy of the GNU General Public License
1108 * along with this program; if not, write to the Free Software
1109 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1110- *
1111- * This program is also available under a commercial proprietary license.
1112- * For more information, contact us at licensing@x264.com.
1113 *****************************************************************************/
1114
1115 #ifndef X264_MIPS_MC_H
1116diff --git a/common/mips/pixel-c.c b/common/mips/pixel-c.c
1117index ecae5fe3..9bdd6b45 100644
1118--- a/common/mips/pixel-c.c
1119+++ b/common/mips/pixel-c.c
1120@@ -18,9 +18,6 @@
1121 * You should have received a copy of the GNU General Public License
1122 * along with this program; if not, write to the Free Software
1123 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1124- *
1125- * This program is also available under a commercial proprietary license.
1126- * For more information, contact us at licensing@x264.com.
1127 *****************************************************************************/
1128
1129 #include "common/common.h"
1130diff --git a/common/mips/pixel.h b/common/mips/pixel.h
1131index 556896bb..90da1c37 100644
1132--- a/common/mips/pixel.h
1133+++ b/common/mips/pixel.h
1134@@ -18,9 +18,6 @@
1135 * You should have received a copy of the GNU General Public License
1136 * along with this program; if not, write to the Free Software
1137 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1138- *
1139- * This program is also available under a commercial proprietary license.
1140- * For more information, contact us at licensing@x264.com.
1141 *****************************************************************************/
1142
1143 #ifndef X264_MIPS_PIXEL_H
1144diff --git a/common/mips/predict-c.c b/common/mips/predict-c.c
1145index 55ae7b65..ffe6b282 100644
1146--- a/common/mips/predict-c.c
1147+++ b/common/mips/predict-c.c
1148@@ -18,9 +18,6 @@
1149 * You should have received a copy of the GNU General Public License
1150 * along with this program; if not, write to the Free Software
1151 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1152- *
1153- * This program is also available under a commercial proprietary license.
1154- * For more information, contact us at licensing@x264.com.
1155 *****************************************************************************/
1156
1157 #include "common/common.h"
1158diff --git a/common/mips/predict.h b/common/mips/predict.h
1159index 393e67e3..5e739cab 100644
1160--- a/common/mips/predict.h
1161+++ b/common/mips/predict.h
1162@@ -18,9 +18,6 @@
1163 * You should have received a copy of the GNU General Public License
1164 * along with this program; if not, write to the Free Software
1165 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1166- *
1167- * This program is also available under a commercial proprietary license.
1168- * For more information, contact us at licensing@x264.com.
1169 *****************************************************************************/
1170
1171 #ifndef X264_MIPS_PREDICT_H
1172diff --git a/common/mips/quant-c.c b/common/mips/quant-c.c
1173index 4078c4b1..c3734c26 100644
1174--- a/common/mips/quant-c.c
1175+++ b/common/mips/quant-c.c
1176@@ -18,9 +18,6 @@
1177 * You should have received a copy of the GNU General Public License
1178 * along with this program; if not, write to the Free Software
1179 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1180- *
1181- * This program is also available under a commercial proprietary license.
1182- * For more information, contact us at licensing@x264.com.
1183 *****************************************************************************/
1184
1185 #include "common/common.h"
1186diff --git a/common/mips/quant.h b/common/mips/quant.h
1187index d76291cc..fdf9667f 100644
1188--- a/common/mips/quant.h
1189+++ b/common/mips/quant.h
1190@@ -18,9 +18,6 @@
1191 * You should have received a copy of the GNU General Public License
1192 * along with this program; if not, write to the Free Software
1193 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1194- *
1195- * This program is also available under a commercial proprietary license.
1196- * For more information, contact us at licensing@x264.com.
1197 *****************************************************************************/
1198
1199 #ifndef X264_MIPS_QUANT_H
1200diff --git a/common/mvpred.c b/common/mvpred.c
1201index 978b5250..0b7001d8 100644
1202--- a/common/mvpred.c
1203+++ b/common/mvpred.c
1204@@ -20,9 +20,6 @@
1205 * You should have received a copy of the GNU General Public License
1206 * along with this program; if not, write to the Free Software
1207 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1208- *
1209- * This program is also available under a commercial proprietary license.
1210- * For more information, contact us at licensing@x264.com.
1211 *****************************************************************************/
1212
1213 #include "common.h"
1214diff --git a/common/opencl.c b/common/opencl.c
1215index 0e863637..0924e9b5 100644
1216--- a/common/opencl.c
1217+++ b/common/opencl.c
1218@@ -19,9 +19,6 @@
1219 * You should have received a copy of the GNU General Public License
1220 * along with this program; if not, write to the Free Software
1221 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1222- *
1223- * This program is also available under a commercial proprietary license.
1224- * For more information, contact us at licensing@x264.com.
1225 *****************************************************************************/
1226
1227 #include "common.h"
1228diff --git a/common/opencl.h b/common/opencl.h
1229index 67ed1e49..0c68945e 100644
1230--- a/common/opencl.h
1231+++ b/common/opencl.h
1232@@ -19,9 +19,6 @@
1233 * You should have received a copy of the GNU General Public License
1234 * along with this program; if not, write to the Free Software
1235 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1236- *
1237- * This program is also available under a commercial proprietary license.
1238- * For more information, contact us at licensing@x264.com.
1239 *****************************************************************************/
1240
1241 #ifndef X264_OPENCL_H
1242diff --git a/common/osdep.c b/common/osdep.c
1243index d7e1e134..a0922614 100644
1244--- a/common/osdep.c
1245+++ b/common/osdep.c
1246@@ -20,9 +20,6 @@
1247 * You should have received a copy of the GNU General Public License
1248 * along with this program; if not, write to the Free Software
1249 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1250- *
1251- * This program is also available under a commercial proprietary license.
1252- * For more information, contact us at licensing@x264.com.
1253 *****************************************************************************/
1254
1255 #include "osdep.h"
1256diff --git a/common/osdep.h b/common/osdep.h
1257index b4ab527a..a9228884 100644
1258--- a/common/osdep.h
1259+++ b/common/osdep.h
1260@@ -20,9 +20,6 @@
1261 * You should have received a copy of the GNU General Public License
1262 * along with this program; if not, write to the Free Software
1263 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1264- *
1265- * This program is also available under a commercial proprietary license.
1266- * For more information, contact us at licensing@x264.com.
1267 *****************************************************************************/
1268
1269 #ifndef X264_OSDEP_H
1270diff --git a/common/pixel.c b/common/pixel.c
1271index d1f61551..28c8023e 100644
1272--- a/common/pixel.c
1273+++ b/common/pixel.c
1274@@ -20,9 +20,6 @@
1275 * You should have received a copy of the GNU General Public License
1276 * along with this program; if not, write to the Free Software
1277 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1278- *
1279- * This program is also available under a commercial proprietary license.
1280- * For more information, contact us at licensing@x264.com.
1281 *****************************************************************************/
1282
1283 #include "common.h"
1284diff --git a/common/pixel.h b/common/pixel.h
1285index 8600317c..34742adc 100644
1286--- a/common/pixel.h
1287+++ b/common/pixel.h
1288@@ -20,9 +20,6 @@
1289 * You should have received a copy of the GNU General Public License
1290 * along with this program; if not, write to the Free Software
1291 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1292- *
1293- * This program is also available under a commercial proprietary license.
1294- * For more information, contact us at licensing@x264.com.
1295 *****************************************************************************/
1296
1297 #ifndef X264_PIXEL_H
1298diff --git a/common/ppc/dct.c b/common/ppc/dct.c
1299index 18ad5a69..b8f2fb7f 100644
1300--- a/common/ppc/dct.c
1301+++ b/common/ppc/dct.c
1302@@ -19,9 +19,6 @@
1303 * You should have received a copy of the GNU General Public License
1304 * along with this program; if not, write to the Free Software
1305 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1306- *
1307- * This program is also available under a commercial proprietary license.
1308- * For more information, contact us at licensing@x264.com.
1309 *****************************************************************************/
1310
1311 #include "common/common.h"
1312diff --git a/common/ppc/dct.h b/common/ppc/dct.h
1313index 97172627..3153fee6 100644
1314--- a/common/ppc/dct.h
1315+++ b/common/ppc/dct.h
1316@@ -19,9 +19,6 @@
1317 * You should have received a copy of the GNU General Public License
1318 * along with this program; if not, write to the Free Software
1319 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1320- *
1321- * This program is also available under a commercial proprietary license.
1322- * For more information, contact us at licensing@x264.com.
1323 *****************************************************************************/
1324
1325 #ifndef X264_PPC_DCT_H
1326diff --git a/common/ppc/deblock.c b/common/ppc/deblock.c
1327index 5a60e72e..fe0f5151 100644
1328--- a/common/ppc/deblock.c
1329+++ b/common/ppc/deblock.c
1330@@ -18,9 +18,6 @@
1331 * You should have received a copy of the GNU General Public License
1332 * along with this program; if not, write to the Free Software
1333 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1334- *
1335- * This program is also available under a commercial proprietary license.
1336- * For more information, contact us at licensing@x264.com.
1337 *****************************************************************************/
1338
1339 #include "common/common.h"
1340diff --git a/common/ppc/deblock.h b/common/ppc/deblock.h
1341index d3a56f56..3aa5b1d2 100644
1342--- a/common/ppc/deblock.h
1343+++ b/common/ppc/deblock.h
1344@@ -18,9 +18,6 @@
1345 * You should have received a copy of the GNU General Public License
1346 * along with this program; if not, write to the Free Software
1347 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1348- *
1349- * This program is also available under a commercial proprietary license.
1350- * For more information, contact us at licensing@x264.com.
1351 *****************************************************************************/
1352
1353 #ifndef X264_PPC_DEBLOCK_H
1354diff --git a/common/ppc/mc.c b/common/ppc/mc.c
1355index a102d69c..4dc59435 100644
1356--- a/common/ppc/mc.c
1357+++ b/common/ppc/mc.c
1358@@ -19,9 +19,6 @@
1359 * You should have received a copy of the GNU General Public License
1360 * along with this program; if not, write to the Free Software
1361 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1362- *
1363- * This program is also available under a commercial proprietary license.
1364- * For more information, contact us at licensing@x264.com.
1365 *****************************************************************************/
1366
1367 #include "common/common.h"
1368diff --git a/common/ppc/mc.h b/common/ppc/mc.h
1369index 4ebf675e..5aca55b2 100644
1370--- a/common/ppc/mc.h
1371+++ b/common/ppc/mc.h
1372@@ -18,9 +18,6 @@
1373 * You should have received a copy of the GNU General Public License
1374 * along with this program; if not, write to the Free Software
1375 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1376- *
1377- * This program is also available under a commercial proprietary license.
1378- * For more information, contact us at licensing@x264.com.
1379 *****************************************************************************/
1380
1381 #ifndef X264_PPC_MC_H
1382diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
1383index 971a791a..e6bf3b9e 100644
1384--- a/common/ppc/pixel.c
1385+++ b/common/ppc/pixel.c
1386@@ -19,9 +19,6 @@
1387 * You should have received a copy of the GNU General Public License
1388 * along with this program; if not, write to the Free Software
1389 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1390- *
1391- * This program is also available under a commercial proprietary license.
1392- * For more information, contact us at licensing@x264.com.
1393 *****************************************************************************/
1394
1395 #include "common/common.h"
1396diff --git a/common/ppc/pixel.h b/common/ppc/pixel.h
1397index 6d02d393..373e270b 100644
1398--- a/common/ppc/pixel.h
1399+++ b/common/ppc/pixel.h
1400@@ -18,9 +18,6 @@
1401 * You should have received a copy of the GNU General Public License
1402 * along with this program; if not, write to the Free Software
1403 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1404- *
1405- * This program is also available under a commercial proprietary license.
1406- * For more information, contact us at licensing@x264.com.
1407 *****************************************************************************/
1408
1409 #ifndef X264_PPC_PIXEL_H
1410diff --git a/common/ppc/ppccommon.h b/common/ppc/ppccommon.h
1411index 3d1b685f..25c33eb0 100644
1412--- a/common/ppc/ppccommon.h
1413+++ b/common/ppc/ppccommon.h
1414@@ -18,9 +18,6 @@
1415 * You should have received a copy of the GNU General Public License
1416 * along with this program; if not, write to the Free Software
1417 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1418- *
1419- * This program is also available under a commercial proprietary license.
1420- * For more information, contact us at licensing@x264.com.
1421 *****************************************************************************/
1422
1423 #if HAVE_ALTIVEC_H
1424diff --git a/common/ppc/predict.c b/common/ppc/predict.c
1425index 403d37ce..e94392d5 100644
1426--- a/common/ppc/predict.c
1427+++ b/common/ppc/predict.c
1428@@ -18,9 +18,6 @@
1429 * You should have received a copy of the GNU General Public License
1430 * along with this program; if not, write to the Free Software
1431 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1432- *
1433- * This program is also available under a commercial proprietary license.
1434- * For more information, contact us at licensing@x264.com.
1435 *****************************************************************************/
1436
1437 #include "common/common.h"
1438diff --git a/common/ppc/predict.h b/common/ppc/predict.h
1439index dbfbcaaa..370f9096 100644
1440--- a/common/ppc/predict.h
1441+++ b/common/ppc/predict.h
1442@@ -18,9 +18,6 @@
1443 * You should have received a copy of the GNU General Public License
1444 * along with this program; if not, write to the Free Software
1445 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1446- *
1447- * This program is also available under a commercial proprietary license.
1448- * For more information, contact us at licensing@x264.com.
1449 *****************************************************************************/
1450
1451 #ifndef X264_PPC_PREDICT_H
1452diff --git a/common/ppc/quant.c b/common/ppc/quant.c
1453index 95cc33b7..6df1df01 100644
1454--- a/common/ppc/quant.c
1455+++ b/common/ppc/quant.c
1456@@ -18,9 +18,6 @@
1457 * You should have received a copy of the GNU General Public License
1458 * along with this program; if not, write to the Free Software
1459 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1460- *
1461- * This program is also available under a commercial proprietary license.
1462- * For more information, contact us at licensing@x264.com.
1463 *****************************************************************************/
1464
1465 #include "common/common.h"
1466diff --git a/common/ppc/quant.h b/common/ppc/quant.h
1467index 472ab9e1..3b3af32a 100644
1468--- a/common/ppc/quant.h
1469+++ b/common/ppc/quant.h
1470@@ -18,9 +18,6 @@
1471 * You should have received a copy of the GNU General Public License
1472 * along with this program; if not, write to the Free Software
1473 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1474- *
1475- * This program is also available under a commercial proprietary license.
1476- * For more information, contact us at licensing@x264.com.
1477 *****************************************************************************/
1478
1479 #ifndef X264_PPC_QUANT_H
1480diff --git a/common/predict.c b/common/predict.c
1481index 3df3f038..46d26aee 100644
1482--- a/common/predict.c
1483+++ b/common/predict.c
1484@@ -21,9 +21,6 @@
1485 * You should have received a copy of the GNU General Public License
1486 * along with this program; if not, write to the Free Software
1487 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1488- *
1489- * This program is also available under a commercial proprietary license.
1490- * For more information, contact us at licensing@x264.com.
1491 *****************************************************************************/
1492
1493 /* predict4x4 are inspired from ffmpeg h264 decoder */
1494diff --git a/common/predict.h b/common/predict.h
1495index 586b71cb..3c2000a2 100644
1496--- a/common/predict.h
1497+++ b/common/predict.h
1498@@ -19,9 +19,6 @@
1499 * You should have received a copy of the GNU General Public License
1500 * along with this program; if not, write to the Free Software
1501 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1502- *
1503- * This program is also available under a commercial proprietary license.
1504- * For more information, contact us at licensing@x264.com.
1505 *****************************************************************************/
1506
1507 #ifndef X264_PREDICT_H
1508diff --git a/common/quant.c b/common/quant.c
1509index e8fc38d6..9b4c2510 100644
1510--- a/common/quant.c
1511+++ b/common/quant.c
1512@@ -21,9 +21,6 @@
1513 * You should have received a copy of the GNU General Public License
1514 * along with this program; if not, write to the Free Software
1515 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1516- *
1517- * This program is also available under a commercial proprietary license.
1518- * For more information, contact us at licensing@x264.com.
1519 *****************************************************************************/
1520
1521 #include "common.h"
1522diff --git a/common/quant.h b/common/quant.h
1523index 97c4074d..31ae0f89 100644
1524--- a/common/quant.h
1525+++ b/common/quant.h
1526@@ -19,9 +19,6 @@
1527 * You should have received a copy of the GNU General Public License
1528 * along with this program; if not, write to the Free Software
1529 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1530- *
1531- * This program is also available under a commercial proprietary license.
1532- * For more information, contact us at licensing@x264.com.
1533 *****************************************************************************/
1534
1535 #ifndef X264_QUANT_H
1536diff --git a/common/rectangle.c b/common/rectangle.c
1537index c6d3bd9a..d8904cb5 100644
1538--- a/common/rectangle.c
1539+++ b/common/rectangle.c
1540@@ -18,9 +18,6 @@
1541 * You should have received a copy of the GNU General Public License
1542 * along with this program; if not, write to the Free Software
1543 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1544- *
1545- * This program is also available under a commercial proprietary license.
1546- * For more information, contact us at licensing@x264.com.
1547 *****************************************************************************/
1548
1549 #include "common.h"
1550diff --git a/common/rectangle.h b/common/rectangle.h
1551index 5c5af3c1..e2480132 100644
1552--- a/common/rectangle.h
1553+++ b/common/rectangle.h
1554@@ -19,9 +19,6 @@
1555 * You should have received a copy of the GNU General Public License
1556 * along with this program; if not, write to the Free Software
1557 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1558- *
1559- * This program is also available under a commercial proprietary license.
1560- * For more information, contact us at licensing@x264.com.
1561 *****************************************************************************/
1562
1563 /* This function should only be called with constant w / h / s arguments! */
1564diff --git a/common/set.c b/common/set.c
1565index 67d94565..989c7a82 100644
1566--- a/common/set.c
1567+++ b/common/set.c
1568@@ -18,9 +18,6 @@
1569 * You should have received a copy of the GNU General Public License
1570 * along with this program; if not, write to the Free Software
1571 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1572- *
1573- * This program is also available under a commercial proprietary license.
1574- * For more information, contact us at licensing@x264.com.
1575 *****************************************************************************/
1576
1577 #include "common.h"
1578diff --git a/common/set.h b/common/set.h
1579index a8da8e87..62866805 100644
1580--- a/common/set.h
1581+++ b/common/set.h
1582@@ -19,9 +19,6 @@
1583 * You should have received a copy of the GNU General Public License
1584 * along with this program; if not, write to the Free Software
1585 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1586- *
1587- * This program is also available under a commercial proprietary license.
1588- * For more information, contact us at licensing@x264.com.
1589 *****************************************************************************/
1590
1591 #ifndef X264_SET_H
1592diff --git a/common/tables.c b/common/tables.c
1593index 0e827927..722a1118 100644
1594--- a/common/tables.c
1595+++ b/common/tables.c
1596@@ -19,9 +19,6 @@
1597 * You should have received a copy of the GNU General Public License
1598 * along with this program; if not, write to the Free Software
1599 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1600- *
1601- * This program is also available under a commercial proprietary license.
1602- * For more information, contact us at licensing@x264.com.
1603 *****************************************************************************/
1604
1605 #include "base.h"
1606diff --git a/common/tables.h b/common/tables.h
1607index 3fc26da3..e2625c8f 100644
1608--- a/common/tables.h
1609+++ b/common/tables.h
1610@@ -19,9 +19,6 @@
1611 * You should have received a copy of the GNU General Public License
1612 * along with this program; if not, write to the Free Software
1613 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1614- *
1615- * This program is also available under a commercial proprietary license.
1616- * For more information, contact us at licensing@x264.com.
1617 *****************************************************************************/
1618
1619 #ifndef X264_TABLES_H
1620diff --git a/common/threadpool.c b/common/threadpool.c
1621index 7fe34564..a97dfa1c 100644
1622--- a/common/threadpool.c
1623+++ b/common/threadpool.c
1624@@ -18,9 +18,6 @@
1625 * You should have received a copy of the GNU General Public License
1626 * along with this program; if not, write to the Free Software
1627 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1628- *
1629- * This program is also available under a commercial proprietary license.
1630- * For more information, contact us at licensing@x264.com.
1631 *****************************************************************************/
1632
1633 #include "common.h"
1634diff --git a/common/threadpool.h b/common/threadpool.h
1635index 21b63c74..10662b84 100644
1636--- a/common/threadpool.h
1637+++ b/common/threadpool.h
1638@@ -18,9 +18,6 @@
1639 * You should have received a copy of the GNU General Public License
1640 * along with this program; if not, write to the Free Software
1641 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1642- *
1643- * This program is also available under a commercial proprietary license.
1644- * For more information, contact us at licensing@x264.com.
1645 *****************************************************************************/
1646
1647 #ifndef X264_THREADPOOL_H
1648diff --git a/common/vlc.c b/common/vlc.c
1649index 5f1f8713..4412f486 100644
1650--- a/common/vlc.c
1651+++ b/common/vlc.c
1652@@ -20,9 +20,6 @@
1653 * You should have received a copy of the GNU General Public License
1654 * along with this program; if not, write to the Free Software
1655 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1656- *
1657- * This program is also available under a commercial proprietary license.
1658- * For more information, contact us at licensing@x264.com.
1659 *****************************************************************************/
1660
1661 #include "common.h"
1662diff --git a/common/win32thread.c b/common/win32thread.c
1663index 40950b87..00a75e5b 100644
1664--- a/common/win32thread.c
1665+++ b/common/win32thread.c
1666@@ -20,9 +20,6 @@
1667 * You should have received a copy of the GNU General Public License
1668 * along with this program; if not, write to the Free Software
1669 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1670- *
1671- * This program is also available under a commercial proprietary license.
1672- * For more information, contact us at licensing@x264.com.
1673 *****************************************************************************/
1674
1675 /* Microsoft's way of supporting systems with >64 logical cpus can be found at
1676diff --git a/common/win32thread.h b/common/win32thread.h
1677index 4f7db100..b9cd0b18 100644
1678--- a/common/win32thread.h
1679+++ b/common/win32thread.h
1680@@ -18,9 +18,6 @@
1681 * You should have received a copy of the GNU General Public License
1682 * along with this program; if not, write to the Free Software
1683 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1684- *
1685- * This program is also available under a commercial proprietary license.
1686- * For more information, contact us at licensing@x264.com.
1687 *****************************************************************************/
1688
1689 #ifndef X264_WIN32THREAD_H
1690diff --git a/common/x86/bitstream-a.asm b/common/x86/bitstream-a.asm
1691index 8e7234e6..cb6a64c6 100644
1692--- a/common/x86/bitstream-a.asm
1693+++ b/common/x86/bitstream-a.asm
1694@@ -19,9 +19,6 @@
1695 ;* You should have received a copy of the GNU General Public License
1696 ;* along with this program; if not, write to the Free Software
1697 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1698-;*
1699-;* This program is also available under a commercial proprietary license.
1700-;* For more information, contact us at licensing@x264.com.
1701 ;*****************************************************************************
1702
1703 %include "x86inc.asm"
1704diff --git a/common/x86/bitstream.h b/common/x86/bitstream.h
1705index 038e44e1..4237cb3b 100644
1706--- a/common/x86/bitstream.h
1707+++ b/common/x86/bitstream.h
1708@@ -18,9 +18,6 @@
1709 * You should have received a copy of the GNU General Public License
1710 * along with this program; if not, write to the Free Software
1711 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1712- *
1713- * This program is also available under a commercial proprietary license.
1714- * For more information, contact us at licensing@x264.com.
1715 *****************************************************************************/
1716
1717 #ifndef X264_X86_BITSTREAM_H
1718diff --git a/common/x86/cabac-a.asm b/common/x86/cabac-a.asm
1719index e9ea0879..1bfff103 100644
1720--- a/common/x86/cabac-a.asm
1721+++ b/common/x86/cabac-a.asm
1722@@ -20,9 +20,6 @@
1723 ;* You should have received a copy of the GNU General Public License
1724 ;* along with this program; if not, write to the Free Software
1725 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1726-;*
1727-;* This program is also available under a commercial proprietary license.
1728-;* For more information, contact us at licensing@x264.com.
1729 ;*****************************************************************************
1730
1731 %include "x86inc.asm"
1732diff --git a/common/x86/const-a.asm b/common/x86/const-a.asm
1733index 9ca596d1..c15930b9 100644
1734--- a/common/x86/const-a.asm
1735+++ b/common/x86/const-a.asm
1736@@ -19,9 +19,6 @@
1737 ;* You should have received a copy of the GNU General Public License
1738 ;* along with this program; if not, write to the Free Software
1739 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1740-;*
1741-;* This program is also available under a commercial proprietary license.
1742-;* For more information, contact us at licensing@x264.com.
1743 ;*****************************************************************************
1744
1745 %include "x86inc.asm"
1746diff --git a/common/x86/cpu-a.asm b/common/x86/cpu-a.asm
1747index f95a43a3..4ee74a97 100644
1748--- a/common/x86/cpu-a.asm
1749+++ b/common/x86/cpu-a.asm
1750@@ -20,9 +20,6 @@
1751 ;* You should have received a copy of the GNU General Public License
1752 ;* along with this program; if not, write to the Free Software
1753 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1754-;*
1755-;* This program is also available under a commercial proprietary license.
1756-;* For more information, contact us at licensing@x264.com.
1757 ;*****************************************************************************
1758
1759 %include "x86inc.asm"
1760diff --git a/common/x86/dct-32.asm b/common/x86/dct-32.asm
1761index ca91b54e..f9882399 100644
1762--- a/common/x86/dct-32.asm
1763+++ b/common/x86/dct-32.asm
1764@@ -22,9 +22,6 @@
1765 ;* You should have received a copy of the GNU General Public License
1766 ;* along with this program; if not, write to the Free Software
1767 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1768-;*
1769-;* This program is also available under a commercial proprietary license.
1770-;* For more information, contact us at licensing@x264.com.
1771 ;*****************************************************************************
1772
1773 %include "x86inc.asm"
1774diff --git a/common/x86/dct-64.asm b/common/x86/dct-64.asm
1775index f4ac586a..ddea6b5d 100644
1776--- a/common/x86/dct-64.asm
1777+++ b/common/x86/dct-64.asm
1778@@ -21,9 +21,6 @@
1779 ;* You should have received a copy of the GNU General Public License
1780 ;* along with this program; if not, write to the Free Software
1781 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1782-;*
1783-;* This program is also available under a commercial proprietary license.
1784-;* For more information, contact us at licensing@x264.com.
1785 ;*****************************************************************************
1786
1787 %include "x86inc.asm"
1788diff --git a/common/x86/dct-a.asm b/common/x86/dct-a.asm
1789index 2652185a..c8911aa1 100644
1790--- a/common/x86/dct-a.asm
1791+++ b/common/x86/dct-a.asm
1792@@ -22,9 +22,6 @@
1793 ;* You should have received a copy of the GNU General Public License
1794 ;* along with this program; if not, write to the Free Software
1795 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1796-;*
1797-;* This program is also available under a commercial proprietary license.
1798-;* For more information, contact us at licensing@x264.com.
1799 ;*****************************************************************************
1800
1801 %include "x86inc.asm"
1802diff --git a/common/x86/dct.h b/common/x86/dct.h
1803index 9c389e80..6d09d31a 100644
1804--- a/common/x86/dct.h
1805+++ b/common/x86/dct.h
1806@@ -20,9 +20,6 @@
1807 * You should have received a copy of the GNU General Public License
1808 * along with this program; if not, write to the Free Software
1809 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1810- *
1811- * This program is also available under a commercial proprietary license.
1812- * For more information, contact us at licensing@x264.com.
1813 *****************************************************************************/
1814
1815 #ifndef X264_X86_DCT_H
1816diff --git a/common/x86/deblock-a.asm b/common/x86/deblock-a.asm
1817index a15c9f66..b19cb235 100644
1818--- a/common/x86/deblock-a.asm
1819+++ b/common/x86/deblock-a.asm
1820@@ -20,9 +20,6 @@
1821 ;* You should have received a copy of the GNU General Public License
1822 ;* along with this program; if not, write to the Free Software
1823 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1824-;*
1825-;* This program is also available under a commercial proprietary license.
1826-;* For more information, contact us at licensing@x264.com.
1827 ;*****************************************************************************
1828
1829 %include "x86inc.asm"
1830diff --git a/common/x86/deblock.h b/common/x86/deblock.h
1831index 2fd33b07..8f2eecc4 100644
1832--- a/common/x86/deblock.h
1833+++ b/common/x86/deblock.h
1834@@ -18,9 +18,6 @@
1835 * You should have received a copy of the GNU General Public License
1836 * along with this program; if not, write to the Free Software
1837 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1838- *
1839- * This program is also available under a commercial proprietary license.
1840- * For more information, contact us at licensing@x264.com.
1841 *****************************************************************************/
1842
1843 #ifndef X264_X86_DEBLOCK_H
1844diff --git a/common/x86/mc-a.asm b/common/x86/mc-a.asm
1845index c28a4b2d..8b95ef26 100644
1846--- a/common/x86/mc-a.asm
1847+++ b/common/x86/mc-a.asm
1848@@ -24,9 +24,6 @@
1849 ;* You should have received a copy of the GNU General Public License
1850 ;* along with this program; if not, write to the Free Software
1851 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1852-;*
1853-;* This program is also available under a commercial proprietary license.
1854-;* For more information, contact us at licensing@x264.com.
1855 ;*****************************************************************************
1856
1857 %include "x86inc.asm"
1858diff --git a/common/x86/mc-a2.asm b/common/x86/mc-a2.asm
1859index 8623364c..e4ca3587 100644
1860--- a/common/x86/mc-a2.asm
1861+++ b/common/x86/mc-a2.asm
1862@@ -22,9 +22,6 @@
1863 ;* You should have received a copy of the GNU General Public License
1864 ;* along with this program; if not, write to the Free Software
1865 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1866-;*
1867-;* This program is also available under a commercial proprietary license.
1868-;* For more information, contact us at licensing@x264.com.
1869 ;*****************************************************************************
1870
1871 %include "x86inc.asm"
1872diff --git a/common/x86/mc-c.c b/common/x86/mc-c.c
1873index 51d915c1..5fcce88c 100644
1874--- a/common/x86/mc-c.c
1875+++ b/common/x86/mc-c.c
1876@@ -20,9 +20,6 @@
1877 * You should have received a copy of the GNU General Public License
1878 * along with this program; if not, write to the Free Software
1879 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1880- *
1881- * This program is also available under a commercial proprietary license.
1882- * For more information, contact us at licensing@x264.com.
1883 *****************************************************************************/
1884
1885 #include "common/common.h"
1886diff --git a/common/x86/mc.h b/common/x86/mc.h
1887index fc83f465..6fb823cb 100644
1888--- a/common/x86/mc.h
1889+++ b/common/x86/mc.h
1890@@ -19,9 +19,6 @@
1891 * You should have received a copy of the GNU General Public License
1892 * along with this program; if not, write to the Free Software
1893 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1894- *
1895- * This program is also available under a commercial proprietary license.
1896- * For more information, contact us at licensing@x264.com.
1897 *****************************************************************************/
1898
1899 #ifndef X264_X86_MC_H
1900diff --git a/common/x86/pixel-32.asm b/common/x86/pixel-32.asm
1901index a6224993..2d38e900 100644
1902--- a/common/x86/pixel-32.asm
1903+++ b/common/x86/pixel-32.asm
1904@@ -19,9 +19,6 @@
1905 ;* You should have received a copy of the GNU General Public License
1906 ;* along with this program; if not, write to the Free Software
1907 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1908-;*
1909-;* This program is also available under a commercial proprietary license.
1910-;* For more information, contact us at licensing@x264.com.
1911 ;*****************************************************************************
1912
1913 %include "x86inc.asm"
1914diff --git a/common/x86/pixel-a.asm b/common/x86/pixel-a.asm
1915index 0652a4fa..c4761cbb 100644
1916--- a/common/x86/pixel-a.asm
1917+++ b/common/x86/pixel-a.asm
1918@@ -23,9 +23,6 @@
1919 ;* You should have received a copy of the GNU General Public License
1920 ;* along with this program; if not, write to the Free Software
1921 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1922-;*
1923-;* This program is also available under a commercial proprietary license.
1924-;* For more information, contact us at licensing@x264.com.
1925 ;*****************************************************************************
1926
1927 %include "x86inc.asm"
1928diff --git a/common/x86/pixel.h b/common/x86/pixel.h
1929index 4acc6d3b..42ab966f 100644
1930--- a/common/x86/pixel.h
1931+++ b/common/x86/pixel.h
1932@@ -20,9 +20,6 @@
1933 * You should have received a copy of the GNU General Public License
1934 * along with this program; if not, write to the Free Software
1935 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1936- *
1937- * This program is also available under a commercial proprietary license.
1938- * For more information, contact us at licensing@x264.com.
1939 *****************************************************************************/
1940
1941 #ifndef X264_X86_PIXEL_H
1942diff --git a/common/x86/predict-a.asm b/common/x86/predict-a.asm
1943index 77a06a11..7452c8cb 100644
1944--- a/common/x86/predict-a.asm
1945+++ b/common/x86/predict-a.asm
1946@@ -21,9 +21,6 @@
1947 ;* You should have received a copy of the GNU General Public License
1948 ;* along with this program; if not, write to the Free Software
1949 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1950-;*
1951-;* This program is also available under a commercial proprietary license.
1952-;* For more information, contact us at licensing@x264.com.
1953 ;*****************************************************************************
1954
1955 %include "x86inc.asm"
1956diff --git a/common/x86/predict-c.c b/common/x86/predict-c.c
1957index f9af0f50..f5b90786 100644
1958--- a/common/x86/predict-c.c
1959+++ b/common/x86/predict-c.c
1960@@ -20,9 +20,6 @@
1961 * You should have received a copy of the GNU General Public License
1962 * along with this program; if not, write to the Free Software
1963 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1964- *
1965- * This program is also available under a commercial proprietary license.
1966- * For more information, contact us at licensing@x264.com.
1967 *****************************************************************************/
1968
1969 #include "common/common.h"
1970diff --git a/common/x86/predict.h b/common/x86/predict.h
1971index b64e577b..fee05247 100644
1972--- a/common/x86/predict.h
1973+++ b/common/x86/predict.h
1974@@ -19,9 +19,6 @@
1975 * You should have received a copy of the GNU General Public License
1976 * along with this program; if not, write to the Free Software
1977 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1978- *
1979- * This program is also available under a commercial proprietary license.
1980- * For more information, contact us at licensing@x264.com.
1981 *****************************************************************************/
1982
1983 #ifndef X264_X86_PREDICT_H
1984diff --git a/common/x86/quant-a.asm b/common/x86/quant-a.asm
1985index 7404e44d..6652f6d4 100644
1986--- a/common/x86/quant-a.asm
1987+++ b/common/x86/quant-a.asm
1988@@ -22,9 +22,6 @@
1989 ;* You should have received a copy of the GNU General Public License
1990 ;* along with this program; if not, write to the Free Software
1991 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
1992-;*
1993-;* This program is also available under a commercial proprietary license.
1994-;* For more information, contact us at licensing@x264.com.
1995 ;*****************************************************************************
1996
1997 %include "x86inc.asm"
1998diff --git a/common/x86/quant.h b/common/x86/quant.h
1999index 1562728d..1cc91835 100644
2000--- a/common/x86/quant.h
2001+++ b/common/x86/quant.h
2002@@ -20,9 +20,6 @@
2003 * You should have received a copy of the GNU General Public License
2004 * along with this program; if not, write to the Free Software
2005 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2006- *
2007- * This program is also available under a commercial proprietary license.
2008- * For more information, contact us at licensing@x264.com.
2009 *****************************************************************************/
2010
2011 #ifndef X264_X86_QUANT_H
2012diff --git a/common/x86/sad-a.asm b/common/x86/sad-a.asm
2013index 3ea2bca5..98a8f784 100644
2014--- a/common/x86/sad-a.asm
2015+++ b/common/x86/sad-a.asm
2016@@ -21,9 +21,6 @@
2017 ;* You should have received a copy of the GNU General Public License
2018 ;* along with this program; if not, write to the Free Software
2019 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2020-;*
2021-;* This program is also available under a commercial proprietary license.
2022-;* For more information, contact us at licensing@x264.com.
2023 ;*****************************************************************************
2024
2025 %include "x86inc.asm"
2026diff --git a/common/x86/sad16-a.asm b/common/x86/sad16-a.asm
2027index df4ad83a..3b8136a6 100644
2028--- a/common/x86/sad16-a.asm
2029+++ b/common/x86/sad16-a.asm
2030@@ -19,9 +19,6 @@
2031 ;* You should have received a copy of the GNU General Public License
2032 ;* along with this program; if not, write to the Free Software
2033 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2034-;*
2035-;* This program is also available under a commercial proprietary license.
2036-;* For more information, contact us at licensing@x264.com.
2037 ;*****************************************************************************
2038
2039 %include "x86inc.asm"
2040diff --git a/common/x86/trellis-64.asm b/common/x86/trellis-64.asm
2041index d94b9b50..321e3f1e 100644
2042--- a/common/x86/trellis-64.asm
2043+++ b/common/x86/trellis-64.asm
2044@@ -18,9 +18,6 @@
2045 ;* You should have received a copy of the GNU General Public License
2046 ;* along with this program; if not, write to the Free Software
2047 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2048-;*
2049-;* This program is also available under a commercial proprietary license.
2050-;* For more information, contact us at licensing@x264.com.
2051 ;*****************************************************************************
2052
2053 ; This is a pretty straight-forward translation of the C code, except:
2054diff --git a/common/x86/util.h b/common/x86/util.h
2055index 1eba416d..ea052e6a 100644
2056--- a/common/x86/util.h
2057+++ b/common/x86/util.h
2058@@ -19,9 +19,6 @@
2059 * You should have received a copy of the GNU General Public License
2060 * along with this program; if not, write to the Free Software
2061 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2062- *
2063- * This program is also available under a commercial proprietary license.
2064- * For more information, contact us at licensing@x264.com.
2065 *****************************************************************************/
2066
2067 #ifndef X264_X86_UTIL_H
2068diff --git a/common/x86/x86util.asm b/common/x86/x86util.asm
2069index e8a8efa7..dcc4fde0 100644
2070--- a/common/x86/x86util.asm
2071+++ b/common/x86/x86util.asm
2072@@ -19,9 +19,6 @@
2073 ;* You should have received a copy of the GNU General Public License
2074 ;* along with this program; if not, write to the Free Software
2075 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2076-;*
2077-;* This program is also available under a commercial proprietary license.
2078-;* For more information, contact us at licensing@x264.com.
2079 ;*****************************************************************************
2080
2081 ; like cextern, but with a plain x264 prefix instead of a bitdepth-specific one
2082diff --git a/configure b/configure
2083index 64b45835..29f45f56 100755
2084--- a/configure
2085+++ b/configure
2086@@ -26,7 +26,6 @@ Configuration options:
2087 --enable-shared build shared library
2088 --enable-static build static library
2089 --disable-opencl disable OpenCL features
2090- --disable-gpl disable GPL-only features
2091 --disable-thread disable multithreaded encoding
2092 --disable-win32thread disable win32threads (windows only)
2093 --disable-interlaced disable interlaced encoding support
2094@@ -453,9 +452,6 @@ for opt do
2095 --disable-lsmash)
2096 lsmash="no"
2097 ;;
2098- --disable-gpl)
2099- gpl="no"
2100- ;;
2101 --extra-asflags=*)
2102 ASFLAGS="$ASFLAGS $optarg"
2103 ;;
2104diff --git a/encoder/analyse.c b/encoder/analyse.c
2105index f5ecfedb..4da9f3b8 100644
2106--- a/encoder/analyse.c
2107+++ b/encoder/analyse.c
2108@@ -20,9 +20,6 @@
2109 * You should have received a copy of the GNU General Public License
2110 * along with this program; if not, write to the Free Software
2111 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2112- *
2113- * This program is also available under a commercial proprietary license.
2114- * For more information, contact us at licensing@x264.com.
2115 *****************************************************************************/
2116
2117 #include "common/common.h"
2118diff --git a/encoder/analyse.h b/encoder/analyse.h
2119index 3048c26d..a8eda8cd 100644
2120--- a/encoder/analyse.h
2121+++ b/encoder/analyse.h
2122@@ -19,9 +19,6 @@
2123 * You should have received a copy of the GNU General Public License
2124 * along with this program; if not, write to the Free Software
2125 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2126- *
2127- * This program is also available under a commercial proprietary license.
2128- * For more information, contact us at licensing@x264.com.
2129 *****************************************************************************/
2130
2131 #ifndef X264_ENCODER_ANALYSE_H
2132diff --git a/encoder/api.c b/encoder/api.c
2133index e50578fd..148d323a 100644
2134--- a/encoder/api.c
2135+++ b/encoder/api.c
2136@@ -19,9 +19,6 @@
2137 * You should have received a copy of the GNU General Public License
2138 * along with this program; if not, write to the Free Software
2139 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2140- *
2141- * This program is also available under a commercial proprietary license.
2142- * For more information, contact us at licensing@x264.com.
2143 *****************************************************************************/
2144
2145 #include "common/base.h"
2146diff --git a/encoder/cabac.c b/encoder/cabac.c
2147index b76ff130..0cdddd97 100644
2148--- a/encoder/cabac.c
2149+++ b/encoder/cabac.c
2150@@ -20,9 +20,6 @@
2151 * You should have received a copy of the GNU General Public License
2152 * along with this program; if not, write to the Free Software
2153 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2154- *
2155- * This program is also available under a commercial proprietary license.
2156- * For more information, contact us at licensing@x264.com.
2157 *****************************************************************************/
2158
2159 #include "common/common.h"
2160diff --git a/encoder/cavlc.c b/encoder/cavlc.c
2161index 7edfe687..9d491b6e 100644
2162--- a/encoder/cavlc.c
2163+++ b/encoder/cavlc.c
2164@@ -20,9 +20,6 @@
2165 * You should have received a copy of the GNU General Public License
2166 * along with this program; if not, write to the Free Software
2167 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2168- *
2169- * This program is also available under a commercial proprietary license.
2170- * For more information, contact us at licensing@x264.com.
2171 *****************************************************************************/
2172
2173 #include "common/common.h"
2174diff --git a/encoder/encoder.c b/encoder/encoder.c
2175index 2dff81d9..1a80136c 100644
2176--- a/encoder/encoder.c
2177+++ b/encoder/encoder.c
2178@@ -20,9 +20,6 @@
2179 * You should have received a copy of the GNU General Public License
2180 * along with this program; if not, write to the Free Software
2181 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2182- *
2183- * This program is also available under a commercial proprietary license.
2184- * For more information, contact us at licensing@x264.com.
2185 *****************************************************************************/
2186
2187 #include "common/common.h"
2188diff --git a/encoder/lookahead.c b/encoder/lookahead.c
2189index 61691e1f..2aada1ae 100644
2190--- a/encoder/lookahead.c
2191+++ b/encoder/lookahead.c
2192@@ -20,9 +20,6 @@
2193 * You should have received a copy of the GNU General Public License
2194 * along with this program; if not, write to the Free Software
2195 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2196- *
2197- * This program is also available under a commercial proprietary license.
2198- * For more information, contact us at licensing@x264.com.
2199 *****************************************************************************/
2200
2201 /* LOOKAHEAD (threaded and non-threaded mode)
2202diff --git a/encoder/macroblock.c b/encoder/macroblock.c
2203index 609cdcb4..4003ac43 100644
2204--- a/encoder/macroblock.c
2205+++ b/encoder/macroblock.c
2206@@ -21,9 +21,6 @@
2207 * You should have received a copy of the GNU General Public License
2208 * along with this program; if not, write to the Free Software
2209 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2210- *
2211- * This program is also available under a commercial proprietary license.
2212- * For more information, contact us at licensing@x264.com.
2213 *****************************************************************************/
2214
2215 #include "common/common.h"
2216diff --git a/encoder/macroblock.h b/encoder/macroblock.h
2217index 8149a5ae..6759270d 100644
2218--- a/encoder/macroblock.h
2219+++ b/encoder/macroblock.h
2220@@ -19,9 +19,6 @@
2221 * You should have received a copy of the GNU General Public License
2222 * along with this program; if not, write to the Free Software
2223 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2224- *
2225- * This program is also available under a commercial proprietary license.
2226- * For more information, contact us at licensing@x264.com.
2227 *****************************************************************************/
2228
2229 #ifndef X264_ENCODER_MACROBLOCK_H
2230diff --git a/encoder/me.c b/encoder/me.c
2231index 8c5a2029..67f1a023 100644
2232--- a/encoder/me.c
2233+++ b/encoder/me.c
2234@@ -20,9 +20,6 @@
2235 * You should have received a copy of the GNU General Public License
2236 * along with this program; if not, write to the Free Software
2237 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2238- *
2239- * This program is also available under a commercial proprietary license.
2240- * For more information, contact us at licensing@x264.com.
2241 *****************************************************************************/
2242
2243 #include "common/common.h"
2244diff --git a/encoder/me.h b/encoder/me.h
2245index f64fce07..c06517dc 100644
2246--- a/encoder/me.h
2247+++ b/encoder/me.h
2248@@ -19,9 +19,6 @@
2249 * You should have received a copy of the GNU General Public License
2250 * along with this program; if not, write to the Free Software
2251 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2252- *
2253- * This program is also available under a commercial proprietary license.
2254- * For more information, contact us at licensing@x264.com.
2255 *****************************************************************************/
2256
2257 #ifndef X264_ENCODER_ME_H
2258diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
2259index b8073614..bd96e1b0 100644
2260--- a/encoder/ratecontrol.c
2261+++ b/encoder/ratecontrol.c
2262@@ -22,9 +22,6 @@
2263 * You should have received a copy of the GNU General Public License
2264 * along with this program; if not, write to the Free Software
2265 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2266- *
2267- * This program is also available under a commercial proprietary license.
2268- * For more information, contact us at licensing@x264.com.
2269 *****************************************************************************/
2270
2271 #undef NDEBUG // always check asserts, the speed effect is far too small to disable them
2272diff --git a/encoder/ratecontrol.h b/encoder/ratecontrol.h
2273index bd2854c5..99aa2f2c 100644
2274--- a/encoder/ratecontrol.h
2275+++ b/encoder/ratecontrol.h
2276@@ -19,9 +19,6 @@
2277 * You should have received a copy of the GNU General Public License
2278 * along with this program; if not, write to the Free Software
2279 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2280- *
2281- * This program is also available under a commercial proprietary license.
2282- * For more information, contact us at licensing@x264.com.
2283 *****************************************************************************/
2284
2285 #ifndef X264_ENCODER_RATECONTROL_H
2286diff --git a/encoder/rdo.c b/encoder/rdo.c
2287index 743934fe..76a199ba 100644
2288--- a/encoder/rdo.c
2289+++ b/encoder/rdo.c
2290@@ -19,9 +19,6 @@
2291 * You should have received a copy of the GNU General Public License
2292 * along with this program; if not, write to the Free Software
2293 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2294- *
2295- * This program is also available under a commercial proprietary license.
2296- * For more information, contact us at licensing@x264.com.
2297 *****************************************************************************/
2298
2299 /* duplicate all the writer functions, just calculating bit cost
2300diff --git a/encoder/set.c b/encoder/set.c
2301index b8e35b23..57c4c801 100644
2302--- a/encoder/set.c
2303+++ b/encoder/set.c
2304@@ -19,9 +19,6 @@
2305 * You should have received a copy of the GNU General Public License
2306 * along with this program; if not, write to the Free Software
2307 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2308- *
2309- * This program is also available under a commercial proprietary license.
2310- * For more information, contact us at licensing@x264.com.
2311 *****************************************************************************/
2312
2313 #include "common/common.h"
2314@@ -594,8 +591,8 @@ int x264_sei_version_write( x264_t *h, bs_t *s )
2315
2316 memcpy( payload, uuid, 16 );
2317 sprintf( payload+16, "x264 - core %d%s - H.264/MPEG-4 AVC codec - "
2318- "Copy%s 2003-2019 - http://www.videolan.org/x264.html - options: %s",
2319- X264_BUILD, X264_VERSION, HAVE_GPL?"left":"right", opts );
2320+ "Copyleft 2003-2019 - http://www.videolan.org/x264.html - options: %s",
2321+ X264_BUILD, X264_VERSION, opts );
2322 length = strlen(payload)+1;
2323
2324 x264_sei_write( s, (uint8_t *)payload, length, SEI_USER_DATA_UNREGISTERED );
2325diff --git a/encoder/set.h b/encoder/set.h
2326index feafc751..701c15cd 100644
2327--- a/encoder/set.h
2328+++ b/encoder/set.h
2329@@ -19,9 +19,6 @@
2330 * You should have received a copy of the GNU General Public License
2331 * along with this program; if not, write to the Free Software
2332 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2333- *
2334- * This program is also available under a commercial proprietary license.
2335- * For more information, contact us at licensing@x264.com.
2336 *****************************************************************************/
2337
2338 #ifndef X264_ENCODER_SET_H
2339diff --git a/encoder/slicetype-cl.c b/encoder/slicetype-cl.c
2340index 5235bf5d..46ac3753 100644
2341--- a/encoder/slicetype-cl.c
2342+++ b/encoder/slicetype-cl.c
2343@@ -18,9 +18,6 @@
2344 * You should have received a copy of the GNU General Public License
2345 * along with this program; if not, write to the Free Software
2346 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2347- *
2348- * This program is also available under a commercial proprietary license.
2349- * For more information, contact us at licensing@x264.com.
2350 *****************************************************************************/
2351
2352 #include "common/common.h"
2353diff --git a/encoder/slicetype-cl.h b/encoder/slicetype-cl.h
2354index f0373a56..5fed7d55 100644
2355--- a/encoder/slicetype-cl.h
2356+++ b/encoder/slicetype-cl.h
2357@@ -18,9 +18,6 @@
2358 * You should have received a copy of the GNU General Public License
2359 * along with this program; if not, write to the Free Software
2360 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2361- *
2362- * This program is also available under a commercial proprietary license.
2363- * For more information, contact us at licensing@x264.com.
2364 *****************************************************************************/
2365
2366 #ifndef X264_ENCODER_SLICETYPE_CL_H
2367diff --git a/encoder/slicetype.c b/encoder/slicetype.c
2368index a520f586..d865ba50 100644
2369--- a/encoder/slicetype.c
2370+++ b/encoder/slicetype.c
2371@@ -20,9 +20,6 @@
2372 * You should have received a copy of the GNU General Public License
2373 * along with this program; if not, write to the Free Software
2374 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2375- *
2376- * This program is also available under a commercial proprietary license.
2377- * For more information, contact us at licensing@x264.com.
2378 *****************************************************************************/
2379
2380 #include "common/common.h"
2381diff --git a/example.c b/example.c
2382index 5321670b..e6aedd08 100644
2383--- a/example.c
2384+++ b/example.c
2385@@ -18,9 +18,6 @@
2386 * You should have received a copy of the GNU General Public License
2387 * along with this program; if not, write to the Free Software
2388 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2389- *
2390- * This program is also available under a commercial proprietary license.
2391- * For more information, contact us at licensing@x264.com.
2392 *****************************************************************************/
2393
2394 #ifdef _WIN32
2395diff --git a/extras/intel_dispatcher.h b/extras/intel_dispatcher.h
2396index f8af8309..e7bee5cc 100644
2397--- a/extras/intel_dispatcher.h
2398+++ b/extras/intel_dispatcher.h
2399@@ -18,9 +18,6 @@
2400 * You should have received a copy of the GNU General Public License
2401 * along with this program; if not, write to the Free Software
2402 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2403- *
2404- * This program is also available under a commercial proprietary license.
2405- * For more information, contact us at licensing@x264.com.
2406 *****************************************************************************/
2407
2408 #ifndef X264_INTEL_DISPATCHER_H
2409diff --git a/filters/filters.c b/filters/filters.c
2410index 0088e2a9..28b02eb7 100644
2411--- a/filters/filters.c
2412+++ b/filters/filters.c
2413@@ -20,9 +20,6 @@
2414 * You should have received a copy of the GNU General Public License
2415 * along with this program; if not, write to the Free Software
2416 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2417- *
2418- * This program is also available under a commercial proprietary license.
2419- * For more information, contact us at licensing@x264.com.
2420 *****************************************************************************/
2421
2422 #include "filters.h"
2423diff --git a/filters/filters.h b/filters/filters.h
2424index f21cf42b..c1cb0d6c 100644
2425--- a/filters/filters.h
2426+++ b/filters/filters.h
2427@@ -19,9 +19,6 @@
2428 * You should have received a copy of the GNU General Public License
2429 * along with this program; if not, write to the Free Software
2430 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2431- *
2432- * This program is also available under a commercial proprietary license.
2433- * For more information, contact us at licensing@x264.com.
2434 *****************************************************************************/
2435
2436 #ifndef X264_FILTERS_H
2437diff --git a/filters/video/cache.c b/filters/video/cache.c
2438index eaad0bd8..441d2be2 100644
2439--- a/filters/video/cache.c
2440+++ b/filters/video/cache.c
2441@@ -18,9 +18,6 @@
2442 * You should have received a copy of the GNU General Public License
2443 * along with this program; if not, write to the Free Software
2444 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2445- *
2446- * This program is also available under a commercial proprietary license.
2447- * For more information, contact us at licensing@x264.com.
2448 *****************************************************************************/
2449
2450 #include "video.h"
2451diff --git a/filters/video/crop.c b/filters/video/crop.c
2452index ef8d83b6..15654c3d 100644
2453--- a/filters/video/crop.c
2454+++ b/filters/video/crop.c
2455@@ -19,9 +19,6 @@
2456 * You should have received a copy of the GNU General Public License
2457 * along with this program; if not, write to the Free Software
2458 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2459- *
2460- * This program is also available under a commercial proprietary license.
2461- * For more information, contact us at licensing@x264.com.
2462 *****************************************************************************/
2463
2464 #include "video.h"
2465diff --git a/filters/video/depth.c b/filters/video/depth.c
2466index e503856c..c0d8388f 100644
2467--- a/filters/video/depth.c
2468+++ b/filters/video/depth.c
2469@@ -18,9 +18,6 @@
2470 * You should have received a copy of the GNU General Public License
2471 * along with this program; if not, write to the Free Software
2472 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2473- *
2474- * This program is also available under a commercial proprietary license.
2475- * For more information, contact us at licensing@x264.com.
2476 *****************************************************************************/
2477
2478 #include "video.h"
2479diff --git a/filters/video/fix_vfr_pts.c b/filters/video/fix_vfr_pts.c
2480index 22fde202..6c607807 100644
2481--- a/filters/video/fix_vfr_pts.c
2482+++ b/filters/video/fix_vfr_pts.c
2483@@ -18,9 +18,6 @@
2484 * You should have received a copy of the GNU General Public License
2485 * along with this program; if not, write to the Free Software
2486 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2487- *
2488- * This program is also available under a commercial proprietary license.
2489- * For more information, contact us at licensing@x264.com.
2490 *****************************************************************************/
2491
2492 #include "video.h"
2493diff --git a/filters/video/internal.c b/filters/video/internal.c
2494index 9a410e83..86783102 100644
2495--- a/filters/video/internal.c
2496+++ b/filters/video/internal.c
2497@@ -18,9 +18,6 @@
2498 * You should have received a copy of the GNU General Public License
2499 * along with this program; if not, write to the Free Software
2500 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2501- *
2502- * This program is also available under a commercial proprietary license.
2503- * For more information, contact us at licensing@x264.com.
2504 *****************************************************************************/
2505
2506 #include "internal.h"
2507diff --git a/filters/video/internal.h b/filters/video/internal.h
2508index 6cf8d07c..feb8e16f 100644
2509--- a/filters/video/internal.h
2510+++ b/filters/video/internal.h
2511@@ -18,9 +18,6 @@
2512 * You should have received a copy of the GNU General Public License
2513 * along with this program; if not, write to the Free Software
2514 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2515- *
2516- * This program is also available under a commercial proprietary license.
2517- * For more information, contact us at licensing@x264.com.
2518 *****************************************************************************/
2519
2520 #ifndef X264_FILTER_VIDEO_INTERNAL_H
2521diff --git a/filters/video/resize.c b/filters/video/resize.c
2522index fd07457c..9663249e 100644
2523--- a/filters/video/resize.c
2524+++ b/filters/video/resize.c
2525@@ -18,9 +18,6 @@
2526 * You should have received a copy of the GNU General Public License
2527 * along with this program; if not, write to the Free Software
2528 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2529- *
2530- * This program is also available under a commercial proprietary license.
2531- * For more information, contact us at licensing@x264.com.
2532 *****************************************************************************/
2533
2534 #include "video.h"
2535diff --git a/filters/video/select_every.c b/filters/video/select_every.c
2536index 4825e809..9acc1c25 100644
2537--- a/filters/video/select_every.c
2538+++ b/filters/video/select_every.c
2539@@ -18,9 +18,6 @@
2540 * You should have received a copy of the GNU General Public License
2541 * along with this program; if not, write to the Free Software
2542 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2543- *
2544- * This program is also available under a commercial proprietary license.
2545- * For more information, contact us at licensing@x264.com.
2546 *****************************************************************************/
2547
2548 #include "video.h"
2549diff --git a/filters/video/source.c b/filters/video/source.c
2550index f291b011..e4b72b8b 100644
2551--- a/filters/video/source.c
2552+++ b/filters/video/source.c
2553@@ -18,9 +18,6 @@
2554 * You should have received a copy of the GNU General Public License
2555 * along with this program; if not, write to the Free Software
2556 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2557- *
2558- * This program is also available under a commercial proprietary license.
2559- * For more information, contact us at licensing@x264.com.
2560 *****************************************************************************/
2561
2562 #include "video.h"
2563diff --git a/filters/video/video.c b/filters/video/video.c
2564index d9df5570..80df32df 100644
2565--- a/filters/video/video.c
2566+++ b/filters/video/video.c
2567@@ -18,9 +18,6 @@
2568 * You should have received a copy of the GNU General Public License
2569 * along with this program; if not, write to the Free Software
2570 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2571- *
2572- * This program is also available under a commercial proprietary license.
2573- * For more information, contact us at licensing@x264.com.
2574 *****************************************************************************/
2575
2576 #include "video.h"
2577diff --git a/filters/video/video.h b/filters/video/video.h
2578index 3c7ba2ac..4c560795 100644
2579--- a/filters/video/video.h
2580+++ b/filters/video/video.h
2581@@ -18,9 +18,6 @@
2582 * You should have received a copy of the GNU General Public License
2583 * along with this program; if not, write to the Free Software
2584 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2585- *
2586- * This program is also available under a commercial proprietary license.
2587- * For more information, contact us at licensing@x264.com.
2588 *****************************************************************************/
2589
2590 #ifndef X264_FILTER_VIDEO_H
2591diff --git a/input/avs.c b/input/avs.c
2592index c9917d30..4094211e 100644
2593--- a/input/avs.c
2594+++ b/input/avs.c
2595@@ -19,9 +19,6 @@
2596 * You should have received a copy of the GNU General Public License
2597 * along with this program; if not, write to the Free Software
2598 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2599- *
2600- * This program is also available under a commercial proprietary license.
2601- * For more information, contact us at licensing@x264.com.
2602 *****************************************************************************/
2603
2604 #include "input.h"
2605diff --git a/input/ffms.c b/input/ffms.c
2606index 2de96be2..a8966bfa 100644
2607--- a/input/ffms.c
2608+++ b/input/ffms.c
2609@@ -20,9 +20,6 @@
2610 * You should have received a copy of the GNU General Public License
2611 * along with this program; if not, write to the Free Software
2612 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2613- *
2614- * This program is also available under a commercial proprietary license.
2615- * For more information, contact us at licensing@x264.com.
2616 *****************************************************************************/
2617
2618 #include "input.h"
2619diff --git a/input/input.c b/input/input.c
2620index f81d3f67..1c011269 100644
2621--- a/input/input.c
2622+++ b/input/input.c
2623@@ -19,9 +19,6 @@
2624 * You should have received a copy of the GNU General Public License
2625 * along with this program; if not, write to the Free Software
2626 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2627- *
2628- * This program is also available under a commercial proprietary license.
2629- * For more information, contact us at licensing@x264.com.
2630 *****************************************************************************/
2631
2632 #include "input.h"
2633diff --git a/input/input.h b/input/input.h
2634index 2f9f8e85..cdc9fea9 100644
2635--- a/input/input.h
2636+++ b/input/input.h
2637@@ -20,9 +20,6 @@
2638 * You should have received a copy of the GNU General Public License
2639 * along with this program; if not, write to the Free Software
2640 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2641- *
2642- * This program is also available under a commercial proprietary license.
2643- * For more information, contact us at licensing@x264.com.
2644 *****************************************************************************/
2645
2646 #ifndef X264_INPUT_H
2647diff --git a/input/lavf.c b/input/lavf.c
2648index 3eceae45..5c8e4e9e 100644
2649--- a/input/lavf.c
2650+++ b/input/lavf.c
2651@@ -19,9 +19,6 @@
2652 * You should have received a copy of the GNU General Public License
2653 * along with this program; if not, write to the Free Software
2654 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2655- *
2656- * This program is also available under a commercial proprietary license.
2657- * For more information, contact us at licensing@x264.com.
2658 *****************************************************************************/
2659
2660 #include "input.h"
2661diff --git a/input/raw.c b/input/raw.c
2662index b93eb276..2f89f275 100644
2663--- a/input/raw.c
2664+++ b/input/raw.c
2665@@ -20,9 +20,6 @@
2666 * You should have received a copy of the GNU General Public License
2667 * along with this program; if not, write to the Free Software
2668 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2669- *
2670- * This program is also available under a commercial proprietary license.
2671- * For more information, contact us at licensing@x264.com.
2672 *****************************************************************************/
2673
2674 #include "input.h"
2675diff --git a/input/thread.c b/input/thread.c
2676index eb46365f..cf2a3d6a 100644
2677--- a/input/thread.c
2678+++ b/input/thread.c
2679@@ -19,9 +19,6 @@
2680 * You should have received a copy of the GNU General Public License
2681 * along with this program; if not, write to the Free Software
2682 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2683- *
2684- * This program is also available under a commercial proprietary license.
2685- * For more information, contact us at licensing@x264.com.
2686 *****************************************************************************/
2687
2688 #include "input.h"
2689diff --git a/input/timecode.c b/input/timecode.c
2690index db4910d5..1ab06d1e 100644
2691--- a/input/timecode.c
2692+++ b/input/timecode.c
2693@@ -18,9 +18,6 @@
2694 * You should have received a copy of the GNU General Public License
2695 * along with this program; if not, write to the Free Software
2696 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2697- *
2698- * This program is also available under a commercial proprietary license.
2699- * For more information, contact us at licensing@x264.com.
2700 *****************************************************************************/
2701
2702 #include "input.h"
2703diff --git a/input/y4m.c b/input/y4m.c
2704index 13e648e1..766f030b 100644
2705--- a/input/y4m.c
2706+++ b/input/y4m.c
2707@@ -19,9 +19,6 @@
2708 * You should have received a copy of the GNU General Public License
2709 * along with this program; if not, write to the Free Software
2710 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2711- *
2712- * This program is also available under a commercial proprietary license.
2713- * For more information, contact us at licensing@x264.com.
2714 *****************************************************************************/
2715
2716 #include "input.h"
2717diff --git a/output/flv.c b/output/flv.c
2718index e6c0df99..a5e0cbe3 100644
2719--- a/output/flv.c
2720+++ b/output/flv.c
2721@@ -18,9 +18,6 @@
2722 * You should have received a copy of the GNU General Public License
2723 * along with this program; if not, write to the Free Software
2724 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2725- *
2726- * This program is also available under a commercial proprietary license.
2727- * For more information, contact us at licensing@x264.com.
2728 *****************************************************************************/
2729
2730 #include "output.h"
2731diff --git a/output/flv_bytestream.c b/output/flv_bytestream.c
2732index d0597711..5ec857c8 100644
2733--- a/output/flv_bytestream.c
2734+++ b/output/flv_bytestream.c
2735@@ -18,9 +18,6 @@
2736 * You should have received a copy of the GNU General Public License
2737 * along with this program; if not, write to the Free Software
2738 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2739- *
2740- * This program is also available under a commercial proprietary license.
2741- * For more information, contact us at licensing@x264.com.
2742 *****************************************************************************/
2743
2744 #include "output.h"
2745diff --git a/output/flv_bytestream.h b/output/flv_bytestream.h
2746index 86822115..2bf584d3 100644
2747--- a/output/flv_bytestream.h
2748+++ b/output/flv_bytestream.h
2749@@ -18,9 +18,6 @@
2750 * You should have received a copy of the GNU General Public License
2751 * along with this program; if not, write to the Free Software
2752 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2753- *
2754- * This program is also available under a commercial proprietary license.
2755- * For more information, contact us at licensing@x264.com.
2756 *****************************************************************************/
2757
2758 #ifndef X264_FLV_BYTESTREAM_H
2759diff --git a/output/matroska.c b/output/matroska.c
2760index d59c36fb..136aff6c 100644
2761--- a/output/matroska.c
2762+++ b/output/matroska.c
2763@@ -18,9 +18,6 @@
2764 * You should have received a copy of the GNU General Public License
2765 * along with this program; if not, write to the Free Software
2766 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2767- *
2768- * This program is also available under a commercial proprietary license.
2769- * For more information, contact us at licensing@x264.com.
2770 *****************************************************************************/
2771
2772 #include "output.h"
2773diff --git a/output/matroska_ebml.c b/output/matroska_ebml.c
2774index 1a6f992d..0f57c2f1 100644
2775--- a/output/matroska_ebml.c
2776+++ b/output/matroska_ebml.c
2777@@ -18,9 +18,6 @@
2778 * You should have received a copy of the GNU General Public License
2779 * along with this program; if not, write to the Free Software
2780 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2781- *
2782- * This program is also available under a commercial proprietary license.
2783- * For more information, contact us at licensing@x264.com.
2784 *****************************************************************************/
2785
2786 #include "output.h"
2787diff --git a/output/matroska_ebml.h b/output/matroska_ebml.h
2788index 882b9f5b..83b4d85d 100644
2789--- a/output/matroska_ebml.h
2790+++ b/output/matroska_ebml.h
2791@@ -18,9 +18,6 @@
2792 * You should have received a copy of the GNU General Public License
2793 * along with this program; if not, write to the Free Software
2794 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2795- *
2796- * This program is also available under a commercial proprietary license.
2797- * For more information, contact us at licensing@x264.com.
2798 *****************************************************************************/
2799
2800 #ifndef X264_MATROSKA_EBML_H
2801diff --git a/output/mp4.c b/output/mp4.c
2802index 40600d93..fb7579ea 100644
2803--- a/output/mp4.c
2804+++ b/output/mp4.c
2805@@ -19,9 +19,6 @@
2806 * You should have received a copy of the GNU General Public License
2807 * along with this program; if not, write to the Free Software
2808 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2809- *
2810- * This program is also available under a commercial proprietary license.
2811- * For more information, contact us at licensing@x264.com.
2812 *****************************************************************************/
2813
2814 #include "output.h"
2815diff --git a/output/mp4_lsmash.c b/output/mp4_lsmash.c
2816index 659587dd..6ae8dfc3 100644
2817--- a/output/mp4_lsmash.c
2818+++ b/output/mp4_lsmash.c
2819@@ -22,9 +22,6 @@
2820 * You should have received a copy of the GNU General Public License
2821 * along with this program; if not, write to the Free Software
2822 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2823- *
2824- * This program is also available under a commercial proprietary license.
2825- * For more information, contact us at licensing@x264.com.
2826 *****************************************************************************/
2827
2828 #include "output.h"
2829diff --git a/output/output.h b/output/output.h
2830index 0d8a52ef..12afd92b 100644
2831--- a/output/output.h
2832+++ b/output/output.h
2833@@ -19,9 +19,6 @@
2834 * You should have received a copy of the GNU General Public License
2835 * along with this program; if not, write to the Free Software
2836 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2837- *
2838- * This program is also available under a commercial proprietary license.
2839- * For more information, contact us at licensing@x264.com.
2840 *****************************************************************************/
2841
2842 #ifndef X264_OUTPUT_H
2843diff --git a/output/raw.c b/output/raw.c
2844index 24d303b0..02baea2f 100644
2845--- a/output/raw.c
2846+++ b/output/raw.c
2847@@ -19,9 +19,6 @@
2848 * You should have received a copy of the GNU General Public License
2849 * along with this program; if not, write to the Free Software
2850 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2851- *
2852- * This program is also available under a commercial proprietary license.
2853- * For more information, contact us at licensing@x264.com.
2854 *****************************************************************************/
2855
2856 #include "output.h"
2857diff --git a/tools/checkasm-a.asm b/tools/checkasm-a.asm
2858index 2a06e98b..10aa51fd 100644
2859--- a/tools/checkasm-a.asm
2860+++ b/tools/checkasm-a.asm
2861@@ -19,9 +19,6 @@
2862 ;* You should have received a copy of the GNU General Public License
2863 ;* along with this program; if not, write to the Free Software
2864 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2865-;*
2866-;* This program is also available under a commercial proprietary license.
2867-;* For more information, contact us at licensing@x264.com.
2868 ;*****************************************************************************
2869
2870 %include "x86inc.asm"
2871diff --git a/tools/checkasm-aarch64.S b/tools/checkasm-aarch64.S
2872index dde8e0d3..afa2c14a 100644
2873--- a/tools/checkasm-aarch64.S
2874+++ b/tools/checkasm-aarch64.S
2875@@ -18,9 +18,6 @@
2876 * You should have received a copy of the GNU General Public License
2877 * along with this program; if not, write to the Free Software
2878 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2879- *
2880- * This program is also available under a commercial proprietary license.
2881- * For more information, contact us at licensing@x264.com.
2882 *****************************************************************************/
2883
2884 #include "../common/aarch64/asm.S"
2885diff --git a/tools/checkasm-arm.S b/tools/checkasm-arm.S
2886index 5aa18c9b..2c66df23 100644
2887--- a/tools/checkasm-arm.S
2888+++ b/tools/checkasm-arm.S
2889@@ -18,9 +18,6 @@
2890 * You should have received a copy of the GNU General Public License
2891 * along with this program; if not, write to the Free Software
2892 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2893- *
2894- * This program is also available under a commercial proprietary license.
2895- * For more information, contact us at licensing@x264.com.
2896 *****************************************************************************/
2897
2898 #include "../common/arm/asm.S"
2899diff --git a/tools/checkasm.c b/tools/checkasm.c
2900index 36d73558..8a765300 100644
2901--- a/tools/checkasm.c
2902+++ b/tools/checkasm.c
2903@@ -20,9 +20,6 @@
2904 * You should have received a copy of the GNU General Public License
2905 * along with this program; if not, write to the Free Software
2906 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2907- *
2908- * This program is also available under a commercial proprietary license.
2909- * For more information, contact us at licensing@x264.com.
2910 *****************************************************************************/
2911
2912 #include <ctype.h>
2913diff --git a/x264.c b/x264.c
2914index d5cbf34b..fb001297 100644
2915--- a/x264.c
2916+++ b/x264.c
2917@@ -23,9 +23,6 @@
2918 * You should have received a copy of the GNU General Public License
2919 * along with this program; if not, write to the Free Software
2920 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2921- *
2922- * This program is also available under a commercial proprietary license.
2923- * For more information, contact us at licensing@x264.com.
2924 *****************************************************************************/
2925
2926 #ifdef _WIN32
2927@@ -361,7 +358,7 @@ static void print_version_info( void )
2928 #if HAVE_GPL
2929 printf( "GPL version 2 or later\n" );
2930 #else
2931- printf( "Non-GPL commercial\n" );
2932+ printf( "nonfree and unredistributable\n" );
2933 #endif
2934 #if HAVE_SWSCALE
2935 const char *license = swscale_license();
2936diff --git a/x264.h b/x264.h
2937index cadaeacc..8dd021d5 100644
2938--- a/x264.h
2939+++ b/x264.h
2940@@ -20,9 +20,6 @@
2941 * You should have received a copy of the GNU General Public License
2942 * along with this program; if not, write to the Free Software
2943 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2944- *
2945- * This program is also available under a commercial proprietary license.
2946- * For more information, contact us at licensing@x264.com.
2947 *****************************************************************************/
2948
2949 #ifndef X264_X264_H
2950diff --git a/x264cli.h b/x264cli.h
2951index 19937178..9c924731 100644
2952--- a/x264cli.h
2953+++ b/x264cli.h
2954@@ -19,9 +19,6 @@
2955 * You should have received a copy of the GNU General Public License
2956 * along with this program; if not, write to the Free Software
2957 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2958- *
2959- * This program is also available under a commercial proprietary license.
2960- * For more information, contact us at licensing@x264.com.
2961 *****************************************************************************/
2962
2963 #ifndef X264_CLI_H
2964diff --git a/x264dll.c b/x264dll.c
2965index d98ddcdc..39397d4a 100644
2966--- a/x264dll.c
2967+++ b/x264dll.c
2968@@ -18,9 +18,6 @@
2969 * You should have received a copy of the GNU General Public License
2970 * along with this program; if not, write to the Free Software
2971 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2972- *
2973- * This program is also available under a commercial proprietary license.
2974- * For more information, contact us at licensing@x264.com.
2975 *****************************************************************************/
2976
2977 #include "common/base.h"
2978diff --git a/x264res.rc b/x264res.rc
2979index 4dc97fd2..436944e0 100644
2980--- a/x264res.rc
2981+++ b/x264res.rc
2982@@ -18,9 +18,6 @@
2983 * You should have received a copy of the GNU General Public License
2984 * along with this program; if not, write to the Free Software
2985 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
2986- *
2987- * This program is also available under a commercial proprietary license.
2988- * For more information, contact us at licensing@x264.com.
2989 *****************************************************************************/
2990
2991 #include <windows.h>
2992--
29932.22.0.windows.1