From patchwork Thu Feb 18 03:42:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25747 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 AF4D4449CDB for ; Thu, 18 Feb 2021 05:46:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 427E068A675; Thu, 18 Feb 2021 05:43:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 208CD68A062 for ; Thu, 18 Feb 2021 05:42:59 +0200 (EET) Received: by mail-wm1-f54.google.com with SMTP id l17so1562200wmq.2 for ; Wed, 17 Feb 2021 19:42:59 -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=+ILaXPj+EHkN/8aneXX1fJ6ZM5Xqq2TCGiEVpUOkKrY=; b=ru/H4EA6OqlFCh2zBxIR+13mMuPwe8jHey8CUBhnOUA+Slqq1LgCo3EGOkoayeMnO2 v2D3zIf1uT6pDGWniThwUxz5B3N+xdSUfZTs+xmlySPkjap4tR4RimbiiQBxw/mCevZ7 Z2u7wsgn152wQB3SUAiunOp1AfuMwCtoGbWf5hFli62hjau26On5Jsuv+6hvPFaRDwoT EsClkVQWj19nmkIMeWJbrZG7xscd/3iPlYAnE6xpx+084c2imiEa3WazxfrafZY8qZ3n X8lSzQJv5dG1CjmMJ5b7wNICrwwHkL7MlgAq/n4/DDqG9gJvtYi4+C7Z16mGXc4QpAZ9 8QdQ== 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=+ILaXPj+EHkN/8aneXX1fJ6ZM5Xqq2TCGiEVpUOkKrY=; b=XSJIBmHlAsEu4ZFOVFOHEjk7jvo5EfPq70+STFVjO36vdrcTaNc9js0JMuZPSeYb9d u/8wIChTwxl07HeZF8eHd4OSLRoDW/gusOl9c0WSLyFGp9hQ1CfmsjKEoHrkwSnSpOjW OQTONQCmUtwUyBQmZ7IRjT+DAkKL/Ea1JZCtLUvFx9ZKQuixazPjqKVeeb5oM7wHtk0Y n5gUcC1+qwmDHFv7ncptVVOwOVgiTrCxG8kgqYU8oFotu7BU6nnyAoZs0R9zgvVbr9P+ 82iTgqu0BKmPvNnwGtkZqO7r9jpdtbwJavm+3engpjoNNdCh48ynIbQRLXe/7FjupR4N DT5A== X-Gm-Message-State: AOAM5318EKGG3ARLQeTmKQtNdM4+aHxo0MAXYHSfcUU0FJWpgMDOw6q+ vkIl9HECazRstnOc8I/6iYYm1Cl2jVk= X-Google-Smtp-Source: ABdhPJxwdMIKCqFpHG7nhPSoRkKjeCVWiHCK3rK/m+2FhH0ubQZYltMUuHy3t9aj/LbzZSYG28+QHw== X-Received: by 2002:a05:600c:4f14:: with SMTP id l20mr1659567wmq.118.1613619779382; Wed, 17 Feb 2021 19:42:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 19:42:59 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Feb 2021 04:42:06 +0100 Message-Id: <20210218034214.2090223-21-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 21/29] avformat/rso: 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/rso.c | 2 ++ libavformat/rso.h | 1 + libavformat/rsodec.c | 2 +- libavformat/rsoenc.c | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/rso.c b/libavformat/rso.c index 7d88f0f5bc..765c0d0d66 100644 --- a/libavformat/rso.c +++ b/libavformat/rso.c @@ -28,3 +28,5 @@ const AVCodecTag ff_codec_rso_tags[] = { { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0101 }, { AV_CODEC_ID_NONE, 0 }, }; + +const AVCodecTag *const ff_rso_codec_tags_list[] = { ff_codec_rso_tags, NULL }; diff --git a/libavformat/rso.h b/libavformat/rso.h index 1f65dd90c7..4f78b40180 100644 --- a/libavformat/rso.h +++ b/libavformat/rso.h @@ -28,5 +28,6 @@ /* The libavcodec codecs we support, and the IDs they have in the file */ extern const AVCodecTag ff_codec_rso_tags[]; +extern const AVCodecTag *const ff_rso_codec_tags_list[]; #endif /* AVFORMAT_RSO_H */ diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index b2d9a7c403..91b86bf006 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -79,5 +79,5 @@ AVInputFormat ff_rso_demuxer = { .read_header = rso_read_header, .read_packet = ff_pcm_read_packet, .read_seek = ff_pcm_read_seek, - .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0}, + .codec_tag = ff_rso_codec_tags_list, }; diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c index beba94b2a7..780538a545 100644 --- a/libavformat/rsoenc.c +++ b/libavformat/rsoenc.c @@ -100,6 +100,6 @@ AVOutputFormat ff_rso_muxer = { .write_header = rso_write_header, .write_packet = ff_raw_write_packet, .write_trailer = rso_write_trailer, - .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0}, + .codec_tag = ff_rso_codec_tags_list, .flags = AVFMT_NOTIMESTAMPS, };