From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id ED7594C362 for ; Thu, 4 Sep 2025 13:08:22 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'hSxQEZyza1Dg7cd9pKuqkLxlpvoKg6Wm5Z11F2R0Wnk=', expected b'Pbq1S5/bdM0bFXlBkcd6C5OMrhoeH/YMkYsurnKzZLI=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756991286; h=mime-version : to : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=hSxQEZyza1Dg7cd9pKuqkLxlpvoKg6Wm5Z11F2R0Wnk=; b=RsvL7UkFLa5gZ9cM1pgPAHiRFsy+UWsS5EUGYaYCJ+pYpD/f7qTsN/vpgnl6FkR4KYnj2 hx/6dWBGCRpXeHKMG7Y+pXcIuwvMJw7uwLAm8ln8gGf2iQSPa+3xX8AmF+zdzMTcFOHUqBU EgAXNegylbTMUAsTkuUQuWTDEyETNaw4VFeC16SXBmjr9LZM5fmedp8lnZ3oOvIngzfizZ5 Nz5+xz1o0xYVjo5kvYrZQtIA/ZbNAoKvEdqpGvgpji7wb0pSs9Hr0WaAzR0fPa0xFLeNm/3 j+jhwQDT3+kzEQZfjWmpYo/aH9w6aIiIROOSAqxyIRVmf1qhZJcYaUQu8r8w== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 04A2968E7AC; Thu, 4 Sep 2025 16:08:06 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1756991274; b=Mwp+ahONGCCl2nGAt2Lm1Me/WTvWV3huzcgVw9tk/tWLSaerXAumCI2qGiZ8IAvKSr7wW oF7sPH6FagtyB01lmJnpSFPDEqe3v7uOb/FmMkc7CZfo1Vk2l+DiR1dJXTcZplgWpMU3Wdr /45Gdv4S+WOfZmV7RQxgQAobbWNQNi+nov4R/KqCqWpuCBhTu4mR/v7OzJh+RGYOoUv79CG zZuwygeNWE+1080O/SRCUcgunXpuke8JkHTiq9Qft/uDU6bPIx6qPiUOi/cdI17fIyO23lf 8Ujat4ptCC+f/31NVxcNCDRAf52Q4kqu3gcGD4vzgHyTqLiFYE3vj8TnQn3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1756991274; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=DPBlU3ikTQKqxX9X6JpZ4r8K39FToueUQFAZxcfPW7U=; b=aNiInzv/Uhaxhpo5gZYDFOZV07zFEGUbmfNPV9xehzvDNddyDtWXzHIyxLqEJn9KR8x32 DH9uJlBnl35Xn+s+ymFt/NLR5BS3uZ2grfeyd+A92Orm7/wMz76t6CH/sDEYeLsh2HIHRV0 eUU5Z/5a6O1PurNmXvqe1mFndDBY0JlRJYwpHzqD9c7HwLD1HseyCdRtQBhJ68tdICe+V9B j+xoGJ5v3/7gbCKsb1AW9JQzdgvvrWiS05Eg1UY2nimF9HsUcKSCEXRMg+/KlJ/NV58/vVz OiJlFHeRHBeo+fOV++vA8M/iIM0DJhKW2bDHDgBNNOQzk1fpfANm+3pfjjfw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756991266; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : from; bh=Pbq1S5/bdM0bFXlBkcd6C5OMrhoeH/YMkYsurnKzZLI=; b=nuot+GojXq4Q+nJ3pu6IMTXSfVrmmbJF6fng79cH4sK6rl5SSD7VsGPw0EonMhSpjUQbx lufEc+RpDCHhokc8K4DdYMtmm3zZrwJ1RtXlhSIIa2lAVMql+l8dNpK8+G4XyN5jYSwbEKt tfkMEATrE1hVHIpg1f8uydDgA6gFYWhdli3LRUup53edBEgxWjyW1hgG8GoFzROcFIwDD10 hfzKXyECb1RRkRTGkPU7G87lmFX2tLnyYIehlJtpjNbo3HRryn5X4wHAJJmSqRBG+oWovnH GVE7GCODwGjAtGDIVPRnqs4b0ggBJZnk0v4wJ1aDX8vrGiDtVqf4PNRgBADQ== Received: from 5d8f51c41678 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9A7AB68E798 for ; Thu, 4 Sep 2025 16:07:46 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Message-ID: <175699126675.25.3947894992118603540@463a07221176> Message-ID-Hash: DPCIGCBFWLUEQAWNONTXER2JFKIZWNV6 X-Message-ID-Hash: DPCIGCBFWLUEQAWNONTXER2JFKIZWNV6 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] WIP:Fix function file_open,file_read,file_write,file_close,file_seek conflict with Nuttx (PR #20435) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: caifan via ffmpeg-devel Cc: caifan Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20435 opened by caifan URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20435 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20435.patch >>From 9a657b6a0700f22d98d5f7d755e8a103fdc9d288 Mon Sep 17 00:00:00 2001 From: caifan3 Date: Thu, 4 Sep 2025 20:58:24 +0800 Subject: [PATCH 1/2] FFMPEG/libavformat: fix function file_open,file_read,file_write,file_close,file_seek conflict with nuttx Signed-off-by: caifan3 --- libavformat/file.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index 97f5955f93..cca5b52d6c 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -138,7 +138,7 @@ static const AVClass fd_class = { .version = LIBAVUTIL_VERSION_INT, }; -static int file_read(URLContext *h, unsigned char *buf, int size) +static int ff_file_read(URLContext *h, unsigned char *buf, int size) { FileContext *c = h->priv_data; int ret; @@ -151,7 +151,7 @@ static int file_read(URLContext *h, unsigned char *buf, int size) return (ret == -1) ? AVERROR(errno) : ret; } -static int file_write(URLContext *h, const unsigned char *buf, int size) +static int ff_file_write(URLContext *h, const unsigned char *buf, int size) { FileContext *c = h->priv_data; int ret; @@ -220,7 +220,7 @@ static int fd_dup(URLContext *h, int oldfd) } #endif -static int file_close(URLContext *h) +static int ff_file_close(URLContext *h) { FileContext *c = h->priv_data; int ret = close(c->fd); @@ -228,7 +228,7 @@ static int file_close(URLContext *h) } /* XXX: use llseek */ -static int64_t file_seek(URLContext *h, int64_t pos, int whence) +static int64_t ff_file_seek(URLContext *h, int64_t pos, int whence) { FileContext *c = h->priv_data; int64_t ret; @@ -282,7 +282,7 @@ static int file_move(URLContext *h_src, URLContext *h_dst) return 0; } -static int file_open(URLContext *h, const char *filename, int flags) +static int ff_file_open(URLContext *h, const char *filename, int flags) { FileContext *c = h->priv_data; int access; @@ -409,11 +409,11 @@ static int file_close_dir(URLContext *h) const URLProtocol ff_file_protocol = { .name = "file", - .url_open = file_open, - .url_read = file_read, - .url_write = file_write, - .url_seek = file_seek, - .url_close = file_close, + .url_open = ff_file_open, + .url_read = ff_file_read, + .url_write = ff_file_write, + .url_seek = ff_file_seek, + .url_close = ff_file_close, .url_get_file_handle = file_get_handle, .url_check = file_check, .url_delete = file_delete, @@ -463,9 +463,9 @@ static int pipe_open(URLContext *h, const char *filename, int flags) const URLProtocol ff_pipe_protocol = { .name = "pipe", .url_open = pipe_open, - .url_read = file_read, - .url_write = file_write, - .url_close = file_close, + .url_read = ff_file_read, + .url_write = ff_file_write, + .url_close = ff_file_close, .url_get_file_handle = file_get_handle, .url_check = file_check, .priv_data_size = sizeof(FileContext), @@ -508,10 +508,10 @@ static int fd_open(URLContext *h, const char *filename, int flags) const URLProtocol ff_fd_protocol = { .name = "fd", .url_open = fd_open, - .url_read = file_read, - .url_write = file_write, - .url_seek = file_seek, - .url_close = file_close, + .url_read = ff_file_read, + .url_write = ff_file_write, + .url_seek = ff_file_seek, + .url_close = ff_file_close, .url_get_file_handle = file_get_handle, .url_check = file_check, .priv_data_size = sizeof(FileContext), @@ -668,10 +668,10 @@ static const AVClass android_content_class = { const URLProtocol ff_android_content_protocol = { .name = "content", .url_open = android_content_open, - .url_read = file_read, - .url_write = file_write, - .url_seek = file_seek, - .url_close = file_close, + .url_read = ff_file_read, + .url_write = ff_file_write, + .url_seek = ff_file_seek, + .url_close = ff_file_close, .url_get_file_handle = file_get_handle, .url_check = NULL, .priv_data_size = sizeof(FileContext), -- 2.49.1 >>From 690f9575f619346be11ae1f9cc3e2d07abc197e4 Mon Sep 17 00:00:00 2001 From: caifan3 Date: Thu, 4 Sep 2025 21:03:52 +0800 Subject: [PATCH 2/2] FFMPEG/fftools: fix function file_open,file_read,file_write,file_close,file_seek conflict with nuttx Signed-off-by: caifan3 --- fftools/cmdutils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index ad020f893a..0348bf7762 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -534,6 +534,7 @@ void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems); double get_rotation(const int32_t *displaymatrix); +#define file_read ff_file_read /* read file contents into a string */ char *file_read(const char *filename); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org