From patchwork Sat Jul 15 18:33:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 42745 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4458261pzb; Sat, 15 Jul 2023 11:33:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlEVKD1ZMjqY93Ekj/e6yy5YWcSFkZ4v+fNde93pG+qewaL8jo6XLQ5OTC5KVglM8gN5j8/N X-Received: by 2002:a17:906:3f13:b0:993:f276:9696 with SMTP id c19-20020a1709063f1300b00993f2769696mr6799523ejj.35.1689446031023; Sat, 15 Jul 2023 11:33:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689446031; cv=none; d=google.com; s=arc-20160816; b=AH3sXOi1JPtk/hcRpBNjVD9N+czTLr/ugZUcsuiLiDC4D3moedVJdJzLzjrAx7Hq8n KRO2RT3FrKy/V6Ogkj3oHMZFrmUsToGYtLw29Osan84fv3CoTJqK64bUIjByiH2ykmLp dTl8KXFs6Lt7cTzhdFdc0+7rFqQfuSTbyWgIH4eJniT0hFYVixY/KOpugvlTL5eZQjPW zBG8FKR2l9DoXbYqqHK6VCmyMPT6aHlFCjRqOsq35sp18mdgxS7rEG0VIrgpQ3yt1iKi C8Ba/XkQZNxoRVQ8Nv1LrRNiM3B17qUEdZ4XXonpKYijrHCNjP0BTgi4w7LaR9gnG2aZ LhRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=xjr1879WQd7CnSJzkJI6TobE06inBwkFbORri8Kf3NI=; fh=KyDKQG2MsL+SdZG4SMDdvGENmEL+dU4wvvJvYlYKmNw=; b=cDVJIipKSaRSP+ZeWKq/Tw6tjnsRAbQP6R7VjY3C6zd8CvOtFNiT44wgoU88PWKASW ioRDt0ZwD5tHJ5bzT5iqcYjUwm3m4Wu+d05wa6sVL6UaUOMDM8it46y8eN4nv2hwnLtL 50N0MY3kO08kwxamjl0HL/6X19EhV3ZfEuZh9AsROAvEPe7fABWMiXZTkaDZ1rmv8UDX YjwoCdfHcjxRJixDTmZSdTZsJxI2kSa80IBHeoF2o6Bu+Hsgk+OwScSsJIwuJwrPDSXG Ssl9zJsFQMGjNDfA1wq2L6ljIzvGDNZMyNhnE4yE/7+2Q/6D2x7XWeh42FoVz68Ald9H kIwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=A8WtGkwF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jr18-20020a170906a99200b00992a91b422fsi3730461ejb.41.2023.07.15.11.33.50; Sat, 15 Jul 2023 11:33:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=A8WtGkwF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1194768C5DC; Sat, 15 Jul 2023 21:33:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F13868BFB1 for ; Sat, 15 Jul 2023 21:33:40 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-666e5f0d60bso1968149b3a.3 for ; Sat, 15 Jul 2023 11:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689446018; x=1692038018; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OCKU9njDEe5SVr2kxcuE7Y6pBVuxwtiqkj2Y2Xg32ZY=; b=A8WtGkwFBWHf2wXAs9dBcD4fJKlgSBh+HVgbLWdU0+lWXdWKzky7JdIN/vgOz6zhgy RNHbkOxqHlyrHRfbhxoKuRkrEfSoD7riAcKM5pSG+tmWVT7D9HUpa3EPUhrenwlfK6M4 XTDthplSp0M09WUpT5TDvpcWubzOrb8j+oW4YgDKZQMfAfbhRWdGhBwWtuuhAvBB5hwh R/KwUbzr5hnThTj018HTSmSbv8iPDzOGVpNgHM5OyzMk6uUY2nhF7pvnDiwWGxWBcdrt LOtcyee74WQqUox81hWQWfyMt7AqQmmLgC5HDq6k0YavJlyPNvhPwwIPod0dkP8kc+h7 2ovQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689446018; x=1692038018; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OCKU9njDEe5SVr2kxcuE7Y6pBVuxwtiqkj2Y2Xg32ZY=; b=CJ+iSSjIBzTqbsTvcZcaQhMsUz3CpRTqdV+kpcrjrhww3tfh4hBnJmLzAda1U8H34Z 739irdMWgNrV87sQ7lWFJbSoC16rajcxJ9mXfu3DUXF1gPr2i13r7Y2ZlcNrmIdPVw2J +fghvHUrPPrWMcXksLI+3YYegNYAv+EmQbKYq1iQ4fhCKgpvoa7Otpt/XxQYzpHLxE5l OPwG9rHl0rkwiLC99M/5jHZphJjiMKTSulF1dcRYlXK+Ohhi8c9Xh0VFF2fA5uALyz/2 veGoeVSzeDN13Xx5l/8SrBevJDMU0CRJ8zS/fcNVZZkMZIr3+k2kbG9jMt01XPBstpf6 0UVg== X-Gm-Message-State: ABy/qLaSQ6+RJJEDIQR7EBWvegT++/ohp5f12oJZyEjzV0IYUEVGR0Cb DmTWcmc8UZl6Be0SVuPC2aoSYFQ6TYMI6Q== X-Received: by 2002:a05:6a20:a417:b0:132:c8da:851d with SMTP id z23-20020a056a20a41700b00132c8da851dmr4926364pzk.18.1689446018061; Sat, 15 Jul 2023 11:33:38 -0700 (PDT) Received: from homestead.aragog.com ([2605:a601:a9ae:9100:b62e:99ff:fe37:7032]) by smtp.gmail.com with ESMTPSA id a2-20020a63bd02000000b0054fe7736ac1sm9651654pgf.76.2023.07.15.11.33.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 11:33:37 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 12:33:36 -0600 Message-Id: <20230715183336.8052-1-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools: Avoid build failure on OSX 10.6 with gcc 4.2.1 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: Pavel Koshevoy Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hKvqMdtTHNLj ... and make code more readable / human friendly. --- fftools/ffmpeg_mux_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 6458414b5f..bade35896f 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1648,7 +1648,8 @@ read_fail: static int create_streams(Muxer *mux, const OptionsContext *o) { - static const int (*map_func[])(Muxer *mux, const OptionsContext *o) = { + typedef int(*TMapFunc)(Muxer *, const OptionsContext *); + static const TMapFunc map_func[] = { [AVMEDIA_TYPE_VIDEO] = map_auto_video, [AVMEDIA_TYPE_AUDIO] = map_auto_audio, [AVMEDIA_TYPE_SUBTITLE] = map_auto_subtitle,