From patchwork Thu Feb 18 03:42:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25744 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F3AA7449CDB for ; Thu, 18 Feb 2021 05:45:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FC8D68A30C; Thu, 18 Feb 2021 05:43:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFFA4689F02 for ; Thu, 18 Feb 2021 05:42:58 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id x4so1636553wmi.3 for ; Wed, 17 Feb 2021 19:42:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=7zEfJVv1frfYqj2/1DyGsJ6iha7Mh40XqCV4O8JQVzE=; b=DQNv67HUTUaR0akGRrvHIBRgzQ7PL5cCC/GP3UctSbnrkl9EZf0uyxXmo2uNwvEwek IljWSCfPO7/BNNzEVSkjYQv+d+nc9JNXpsVbYdumhMBiT+6to9kflK91Aj1wgC8JSVi0 N7EQ/I0BNCL6PxuTjQFYfRbcUw3UriBuQwlJrWDCpXLkiZmLE5XqBpnq28f89B9rilnV 9mbiRwuaj5D1cMlmHBX4l+roV72HkUenrCJRFKgope4bthuUPnUNT9FZ8ZYaIkBdisrs BdDzwo6NLCev89dN9/PPc/IRvM5kqw20zOstKGtvQ/42xlfHOmbQWY/bKttu+pDTwQlQ 02UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=7zEfJVv1frfYqj2/1DyGsJ6iha7Mh40XqCV4O8JQVzE=; b=awVfcJ5XF7ai6F0DhlkD3lhP8vVe9ZDNC+omI2+fT9lnAY2aCff4jqFEpfXBbnkz37 YdiWLL4YsEoj71u1hwAV+TcWonAtYmKeS2HOJIJC93xvoJMD2ZETJlLt1wFjSb34sSJo vhS3a2B5A1uIsDnomtavtuMVhpWffujB0hj0+b+0F/b9pHyiiI4+9AUWHbuAFTVsfYkT y7YC642RHeWBeAH5vI64H0GlMSJOhdnbmTI2wSzwFBIgevlo85yTGU7xdUK7/up0DQOl ORkBNtY6EacD8bn0Bacm9l9o/XFnXyFpDeHTNraBZW8pLR5JT9uJ7mcsByrTtVw3B7I5 PRzg== X-Gm-Message-State: AOAM532EhBQr0eLEDIFmy5OWsuZmbMmm3Q8JzA5bq2RYlbdsWD2isp0P ld4aJq1CSRGcZSLhaOzY4XINfBmeLIQ= X-Google-Smtp-Source: ABdhPJwNgxUaEBqr4crhSncoc1P3jkxpApzd5LvPsNmYp2xmgkGOt+Dw4Ml0LVWe/5RuMB1hg8XlFA== X-Received: by 2002:a1c:6308:: with SMTP id x8mr1658464wmb.78.1613619777962; Wed, 17 Feb 2021 19:42:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id p9sm5643855wmc.1.2021.02.17.19.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 19:42:57 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Feb 2021 04:42:04 +0100 Message-Id: <20210218034214.2090223-19-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> References: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/29] avformat/caf: Deduplicate codec tags list X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also saves a relocation. Signed-off-by: Andreas Rheinhardt --- libavformat/caf.c | 1 + libavformat/caf.h | 1 + libavformat/cafdec.c | 2 +- libavformat/cafenc.c | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/caf.c b/libavformat/caf.c index fe242ff032..a700e4055b 100644 --- a/libavformat/caf.c +++ b/libavformat/caf.c @@ -78,3 +78,4 @@ const AVCodecTag ff_codec_caf_tags[] = { { AV_CODEC_ID_NONE, 0 }, }; +const AVCodecTag *const ff_caf_codec_tags_list[] = { ff_codec_caf_tags, NULL }; diff --git a/libavformat/caf.h b/libavformat/caf.h index 9c25f2c683..ed0392b1f1 100644 --- a/libavformat/caf.h +++ b/libavformat/caf.h @@ -30,5 +30,6 @@ #include "internal.h" extern const AVCodecTag ff_codec_caf_tags[]; +extern const AVCodecTag *const ff_caf_codec_tags_list[]; #endif /* AVFORMAT_CAF_H */ diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index b7a9711cc5..d56187f71f 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -460,5 +460,5 @@ AVInputFormat ff_caf_demuxer = { .read_header = read_header, .read_packet = read_packet, .read_seek = read_seek, - .codec_tag = (const AVCodecTag* const []){ ff_codec_caf_tags, 0 }, + .codec_tag = ff_caf_codec_tags_list, }; diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 98d4d9212f..7e44797a52 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -274,5 +274,5 @@ AVOutputFormat ff_caf_muxer = { .write_header = caf_write_header, .write_packet = caf_write_packet, .write_trailer = caf_write_trailer, - .codec_tag = (const AVCodecTag* const []){ff_codec_caf_tags, 0}, + .codec_tag = ff_caf_codec_tags_list, };