From: "Marvin Scholz" <epirat07@gmail.com> To: <ffmpeg-devel@ffmpeg.org> Subject: [FFmpeg-devel] [PATCH 05/11] lavfi/metal: fix mixed declaration and code Date: Fri, 12 Jul 2024 18:17:35 +0200 Message-ID: <D2NQZKJWIKRK.KD4LQ30H62Z8@gmail.com> (raw) In-Reply-To: <D2NQZKJWHOCW.282WOMUB0ZOAZ@gmail.com> Fix a "mixing declarations and code is incompatible with standards before C99" warning. --- libavfilter/metal/utils.m | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavfilter/metal/utils.m b/libavfilter/metal/utils.m index f365d3ceea..d5c85e619d 100644 --- a/libavfilter/metal/utils.m +++ b/libavfilter/metal/utils.m @@ -24,11 +24,15 @@ void ff_metal_compute_encoder_dispatch(id<MTLDevice> device, id<MTLComputeCommandEncoder> encoder, NSUInteger width, NSUInteger height) { - [encoder setComputePipelineState:pipeline]; - NSUInteger w = pipeline.threadExecutionWidth; - NSUInteger h = pipeline.maxTotalThreadsPerThreadgroup / w; - MTLSize threadsPerThreadgroup = MTLSizeMake(w, h, 1); BOOL fallback = YES; + MTLSize threadsPerThreadgroup; + NSUInteger w, h; + + [encoder setComputePipelineState:pipeline]; + w = pipeline.threadExecutionWidth; + h = pipeline.maxTotalThreadsPerThreadgroup / w; + threadsPerThreadgroup = MTLSizeMake(w, h, 1); + // MAC_OS_X_VERSION_10_15 is only defined on SDKs new enough to include its functionality (including iOS, tvOS, etc) #ifdef MAC_OS_X_VERSION_10_15 if (@available(macOS 10.15, iOS 11, tvOS 14.5, *)) { -- 2.39.3 (Apple Git-146) _______________________________________________ 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".
next prev parent reply other threads:[~2024-07-12 17:48 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-07-12 15:44 [FFmpeg-devel] [PATCH 01/11] avdevice/audiotoolbox: " Marvin Scholz 2024-07-12 15:47 ` [FFmpeg-devel] [PATCH 02/11] avfilter/af_channelsplit: " Marvin Scholz 2024-07-14 17:39 ` Leo Izen 2024-07-12 16:07 ` [FFmpeg-devel] [PATCH 03/11] avdevice/avfoundation: fix mixed declarations " Marvin Scholz 2024-07-12 16:09 ` [FFmpeg-devel] [PATCH 04/11] avdevice/avfoundation: remove write-only variable Marvin Scholz 2024-07-12 16:17 ` Marvin Scholz [this message] 2024-07-12 16:21 ` [FFmpeg-devel] [PATCH 06/11] lavfi/metal: simplify fallback Marvin Scholz 2024-07-12 17:13 ` [FFmpeg-devel] [PATCH 07/11] avfilter/vf_coreimage: fix mixed declaration and code Marvin Scholz 2024-07-12 17:19 ` [FFmpeg-devel] [PATCH 08/11] avfilter/vf_coreimage: simplify list_filters code Marvin Scholz 2024-07-12 17:30 ` [FFmpeg-devel] [PATCH 09/11] avfilter/vf_coreimage: silence AVFrame deprecation warnings Marvin Scholz 2024-07-12 17:36 ` [FFmpeg-devel] [PATCH 10/11] avfilter/yadif_common: remove unused variable Marvin Scholz 2024-07-13 0:50 ` Andreas Rheinhardt 2024-07-13 14:47 ` epirat07 2024-07-12 17:43 ` [FFmpeg-devel] [PATCH 11/11] avfilter/yadif_common: fix mixed declaration and code Marvin Scholz 2024-07-15 8:39 ` [FFmpeg-devel] [PATCH 01/11] avdevice/audiotoolbox: " Zhao Zhili
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=D2NQZKJWIKRK.KD4LQ30H62Z8@gmail.com \ --to=epirat07@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git