From 3b47ac45eaf692595667400e74597166a6fa51f3 Mon Sep 17 00:00:00 2001 From: Robo Date: Tue, 16 Aug 2022 23:12:26 +0900 Subject: [PATCH] chore: include notice for H.264/AVC (#158255) * chore: include notice for H.264/AVC * chore: add ffmpeg to cgmanifest --- cglicenses.json | 17 +++++++++++++++++ cgmanifest.json | 13 +++++++++++++ 2 files changed, 30 insertions(+) diff --git a/cglicenses.json b/cglicenses.json index 5612be62696..3ee0cfae7d3 100644 --- a/cglicenses.json +++ b/cglicenses.json @@ -201,4 +201,21 @@ "SOFTWARE" ] } + { + // Reason: This product includes AVC coding technology. MPEG LA LLC requires this notice. + "name": "H.264/AVC Video Standard", + "fullLicenseText": [ + "This product is licensed under the AVC patent portfolio license for the personal", + "and non-commercial use of a consumer to (i) encode video in compliance with the AVC standard (\"AVC VIDEO\")", + "and/or (ii) decode AVC video that was encoded by a consumer", + "engaged in a personal and non-commercial activity and/or was obtained from a video provider", + "licensed to provide AVC video. No license is granted or shall be implied for any other use.", + "Additional information may be obtained from MPEG LA LLC. See http://www.MPEGLA.COM.", + "", + "For clarification purposes, this notice does not limit or inhibit the use of the product", + "for normal business uses that are personal to that business which do not include", + "(i) redistribution of the product to third parties, or", + "(ii) creation of content with AVC Standard compliant technologies for distribution to third parties." + ] + } ] diff --git a/cgmanifest.json b/cgmanifest.json index 9ca8377ac29..bb476c6b183 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -42,6 +42,19 @@ "isOnlyProductionDependency": true, "version": "102.0.5005.167" }, + { + "component": { + "type": "git", + "git": { + "name": "ffmpeg", + "repositoryUrl": "https://chromium.googlesource.com/chromium/third_party/ffmpeg", + "commitHash": "5cd95cdf972ad92c38a4ea2d059ac9d6167302ca" + } + }, + "isOnlyProductionDependency": true, + "license": "LGPL-2.1+", + "version": "4.4.git" + }, { "component": { "type": "git",