From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 541794B8DA for ; Fri, 19 Jul 2024 13:54:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6112468D98A; Fri, 19 Jul 2024 16:54:50 +0300 (EEST) Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D58E68D6E1 for ; Fri, 19 Jul 2024 16:54:44 +0300 (EEST) Received: from 0.b.4.b.7.4.0.8.c.4.a.5.d.8.b.2.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:2b8d:5a4c:8047:b4b0] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1sUo4J-002PXt-2Z; Fri, 19 Jul 2024 14:54:43 +0100 From: Andrew Sayers To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Jul 2024 14:54:09 +0100 Message-ID: <20240719135409.2921601-1-ffmpeg-devel@pileofstuff.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avfilter: fix data type for {Tile, Untile}Context's image size X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andrew Sayers Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: These are accessed as AV_OPT_TYPE_IMAGE_SIZE AVOptions, so must be implemented as (signed) int's --- doc/APIchanges | 6 ++++++ libavfilter/version_major.h | 1 + libavfilter/vf_tile.c | 4 ++++ libavfilter/vf_untile.c | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 5751216b24..e839d1b674 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,12 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-07-19 - xxxxxxxxxx - lavfi 10 - vf_tile.c + Convert TileContext::w and TileContext::h from unsigned to int + +2024-07-19 - xxxxxxxxxx - lavfi 10 - vf_untile.c + Convert UntileContext::w and UntileContext::h from unsigned to int + 2024-07-xx - xxxxxxxxxx - lavf 61 - avformat.h Deprecate avformat_transfer_internal_stream_timing_info() and av_stream_get_codec_timebase() without replacement. diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h index c5e660eeda..a8dc790c0a 100644 --- a/libavfilter/version_major.h +++ b/libavfilter/version_major.h @@ -36,5 +36,6 @@ */ #define FF_API_LINK_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 11) +#define FF_API_TILE_SIZE_TYPE (LIBAVFILTER_VERSION_MAJOR < 11) #endif /* AVFILTER_VERSION_MAJOR_H */ diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c index b45e739bb6..0076657c92 100644 --- a/libavfilter/vf_tile.c +++ b/libavfilter/vf_tile.c @@ -34,7 +34,11 @@ typedef struct TileContext { const AVClass *class; +#if FF_API_TILE_SIZE_TYPE unsigned w, h; +#else + int w, h; +#endif unsigned margin; unsigned padding; unsigned overlap; diff --git a/libavfilter/vf_untile.c b/libavfilter/vf_untile.c index f32f3e186b..5164e2efb0 100644 --- a/libavfilter/vf_untile.c +++ b/libavfilter/vf_untile.c @@ -28,7 +28,11 @@ typedef struct UntileContext { const AVClass *class; +#if FF_API_TILE_SIZE_TYPE unsigned w, h; +#else + int w, h; +#endif unsigned current; unsigned nb_frames; AVFrame *frame; -- 2.45.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".