From patchwork Sun Jul 16 08:29:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42754 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4721764pzb; Sun, 16 Jul 2023 01:30:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlF1IKy2aB7QfMQGjl9t7lb7tbUQVtGr46K9kZ9R0QGEQ6QQML8iochOqKfQYz7YLiw6y6jw X-Received: by 2002:aa7:cfc3:0:b0:51d:dbf1:c825 with SMTP id r3-20020aa7cfc3000000b0051ddbf1c825mr10594481edy.1.1689496199802; Sun, 16 Jul 2023 01:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689496199; cv=none; d=google.com; s=arc-20160816; b=ZVgNl2Zxyh3B/02v4WwZuTRNb7DDHi8OYTTmkLCSxNJtpbpsK3wk5BdGd5Z7gvwcUT Y8TXkDrqnSxoifMsQ3zRxe8E4Cdt+XH6lU3jcllL9jnIlb/1WnJ2jhVXs03LRQdtta++ cyIXE0krrIHpWYIfI7Dk9KkaaS2XAv4CxFikE75f1cLI8K2n71Fk6JTPlU6QFL1rHoRO SemBbsQos+Mtobl5Pv6SXpfU/oZX4Ztns53h7dSKMG3VaFZaM0reNcE5nuWQGJElnFql 0i3YEiQqOCU0xfuAjHyeTDFeTB/hoN34tx8Yy8DT/W9mrfDTIg+knvuI727QwK7V20zC XafQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=OsH43f4XkPT3bBPoYjrve818hux3GD2zuWXSsnldh4s=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=NF/xlSyrV42pfmd/TnOFwwKdBu8ZOk28hBBpLYndWgcCPVD7lyGcm2svD8A+Ky6xbs 9bFl2JjhPjzdUUUCNJxRJUhCkw0F3c+6tgOuUjwBBARAUJ6scqpg3rHh0L2doyNC+4yw eFujCrkAyZPlDXWnk5Zi+4XhfiIHFNXTBIgEDG8pLXGnrLMvQjOE76yILvfPen26LE+F 0wcg89bkSLZd+vl+tmfG4hhEtTfwHq2l1+mMSm41RMpQG7OnCuPghS9exQIUd/w7mgVM C6WyxOT3mtueAUA3JJ/Ko6eBfIuF7uaa5l1o3INoKftz8j1ER4C+D+hcfG6PM9X6P2X7 4ARA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g13-20020a50ee0d000000b0051e0252e3e9si2076183eds.362.2023.07.16.01.29.59; Sun, 16 Jul 2023 01:29:59 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CBED68C558; Sun, 16 Jul 2023 11:29:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48D2168BF0F for ; Sun, 16 Jul 2023 11:29:49 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 990562404EC for ; Sun, 16 Jul 2023 10:29:48 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id g-Z2ZhjulJit for ; Sun, 16 Jul 2023 10:29:47 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C870D2404EA for ; Sun, 16 Jul 2023 10:29:47 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 879483A022D for ; Sun, 16 Jul 2023 10:29:47 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 10:29:34 +0200 Message-Id: <20230716082934.15838-1-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: fix an array declaration 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: exrMNYpjV+T7 map_func is supposed to be an array of const pointer to function returning int, not an array of pointer to function returning const int. Reported-By: Martin Storsjö --- fftools/ffmpeg_mux_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 6458414b5f..c2630dd893 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1648,7 +1648,7 @@ read_fail: static int create_streams(Muxer *mux, const OptionsContext *o) { - static const int (*map_func[])(Muxer *mux, const OptionsContext *o) = { + static int (* const map_func[])(Muxer *mux, const OptionsContext *o) = { [AVMEDIA_TYPE_VIDEO] = map_auto_video, [AVMEDIA_TYPE_AUDIO] = map_auto_audio, [AVMEDIA_TYPE_SUBTITLE] = map_auto_subtitle,