From 5dc32d1e1d0256cd73568c5643d0f0bf15ee2af9 Mon Sep 17 00:00:00 2001 From: zhang_hanyong Date: Thu, 2 Nov 2023 17:30:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0README.md=E5=92=8CREADME.?= =?UTF-8?q?OpenSource=E7=9A=84=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhang_hanyong --- README.OpenSource | 2 +- README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.OpenSource b/README.OpenSource index fd92420..be12921 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -31,7 +31,7 @@ "Name": "FFmpegMediaMetadataRetriever", "License": "Apache License 2.0", "License File": "LICENSE-2.0.txt", - "Version Number": "master", + "Version Number": "1.0.19", "Owner" : "xiafeng@huawei.com", "Upstream URL": "https://github.com/wseemann/FFmpegMediaMetadataRetriever", "Description": "FFmpegMediaMetadataRetriever provides a unified interface for retrieving frame and meta data from an input media file." diff --git a/README.md b/README.md index 09847e7..2b5eef9 100644 --- a/README.md +++ b/README.md @@ -267,6 +267,7 @@ import {ICallBack, IFrameCallBack, MP4Parser} from "@ohos/mp4parser"; 在下述版本验证通过： DevEco Studio版本: 4.0 Release(4.0.3.413), SDK: (4.0.10.3) +DevEco Studio版本: 4.0 Release(4.0.3.600), SDK: (4.0.10.11) ## 目录结构 ```` @@ -281,4 +282,4 @@ DevEco Studio版本: 4.0 Release(4.0.3.413), SDK: (4.0.10.3) 使用过程中发现任何问题都可以提 [Issue](https://gitee.com/openharmony-tpc/mp4parser/issues) 给我们，当然，我们也非常欢迎你给我们发 [PR](https://gitee.com/openharmony-tpc/mp4parser/pulls) 。 ## 开源协议 -本项目基于 [Apache License 2.0](https://gitee.com/openharmony-tpc/mp4parser/blob/master/LICENSE) ，请自由地享受和参与开源。 \ No newline at end of file +本项目基于 [Apache License 2.0](https://gitee.com/openharmony-tpc/mp4parser/blob/master/LICENSE) ，请自由地享受和参与开源。 -- Gitee From a9954dc1899bfb43bec8d45f93bd569d1c92f07c Mon Sep 17 00:00:00 2001 From: zhang_hanyong Date: Fri, 3 Nov 2023 18:56:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9custom=5Fffmpeg=5Flog?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E7=89=88=E6=9D=83=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhang_hanyong --- .../src/main/cpp/ffmpeg/custom_ffmpeg_log.c | 25 +++++++++++-------- .../src/main/cpp/ffmpeg/custom_ffmpeg_log.h | 25 +++++++++++-------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/mp4parser/src/main/cpp/ffmpeg/custom_ffmpeg_log.c b/mp4parser/src/main/cpp/ffmpeg/custom_ffmpeg_log.c index cd113a4..de86c68 100644 --- a/mp4parser/src/main/cpp/ffmpeg/custom_ffmpeg_log.c +++ b/mp4parser/src/main/cpp/ffmpeg/custom_ffmpeg_log.c @@ -1,16 +1,21 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * ffmpeg option parsing * - * http://www.apache.org/licenses/LICENSE-2.0 + * This file is for openHarmony use. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "custom_ffmpeg_log.h" diff --git a/mp4parser/src/main/cpp/ffmpeg/custom_ffmpeg_log.h b/mp4parser/src/main/cpp/ffmpeg/custom_ffmpeg_log.h index 0fbf2d6..7492569 100644 --- a/mp4parser/src/main/cpp/ffmpeg/custom_ffmpeg_log.h +++ b/mp4parser/src/main/cpp/ffmpeg/custom_ffmpeg_log.h @@ -1,16 +1,21 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * ffmpeg option parsing * - * http://www.apache.org/licenses/LICENSE-2.0 + * This file is for openHarmony use. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef mp4parser_custom_ffmpeg_log_H -- Gitee