diff --git a/README.OpenSource b/README.OpenSource index a351a4ed2b01dcf049a559ad08a59be5f8918aec..a6ccd0d8b803797e78ab4964ea5439bae8bb851d 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -1,34 +1,17 @@ [ - { - "Name": "mp4parser", - "License": "Apache License 2.0", - "License File": " LICENSE ", - "Version Number": "1.0.7.1", - "Owner" : "xiafeng@huawei.com", - "Upstream URL": "https://github.com/sannies/mp4parser", - "Description": "A Java API to read, write and create MP4 files" - }, - { - "Name": "ffmpeg", - "License": "Most files in FFmpeg are under the GNU Lesser General Public License version 2.1 or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to FFmpeg. Some optional parts of FFmpeg are licensed under the GNU General Public License version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of these parts are used by default, you have to explicitly pass --enable-gpl to configure to activate them. In this case, FFmpeg's license changes to GPL v2+.", - "License File": "LICENSE.md", - "Version Number": "n4.2.5", - "Owner" : "xiafeng@huawei.com", - "Upstream URL": "https://github.com/FFmpeg/FFmpeg", - "Description": "FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata." - }, { "Name": "FFmpeg-Invoker", - "License": "Apache License 2.0", + "License": "Apache-2.0", "License File": "README.md", "Version Number": "master", "Owner" : "xiafeng@huawei.com", "Upstream URL": "https://github.com/xch168/FFmpeg-Invoker", - "Description": "FFmpeg invoker for Android, base on FFmpeg 4.2.(Supports Android 4.1+)" + "Description": "FFmpeg invoker for Android, base on FFmpeg 4.2.(Supports Android 4.1+)", + "Dependencies": ["ffmpeg"] }, { "Name": "FFmpegMediaMetadataRetriever", - "License": "Apache License 2.0", + "License": "Apache-2.0", "License File": "LICENSE-2.0.txt", "Version Number": "1.0.19", "Owner" : "xiafeng@huawei.com", diff --git a/library/src/main/cpp/ffmpeg/README.OpenSource b/library/src/main/cpp/ffmpeg/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..84b1ea47ad8b83322ee8344fe5ed5329ea4c2b5d --- /dev/null +++ b/library/src/main/cpp/ffmpeg/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "ffmpeg", + "License": "Most files in FFmpeg are under the GNU Lesser General Public License version 2.1 or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to FFmpeg. Some optional parts of FFmpeg are licensed under the GNU General Public License version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of these parts are used by default, you have to explicitly pass --enable-gpl to configure to activate them. In this case, FFmpeg's license changes to GPL v2+.", + "License File": "LICENSE.md", + "Version Number": "n4.2.5", + "Owner" : "xiafeng@huawei.com", + "Upstream URL": "https://github.com/FFmpeg/FFmpeg", + "Description": "FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata." + } +] \ No newline at end of file