From patchwork Thu Feb 18 03:42:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25745 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 C24C4449CDB for ; Thu, 18 Feb 2021 05:45:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 74102687F69; Thu, 18 Feb 2021 05:43:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DB36689FD9 for ; Thu, 18 Feb 2021 05:42:59 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id g6so1124625wrs.11 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=s9Na8vImvEN9a9H7n/HabthDmta2r2NCc5i/qyiDy6I=; b=tIHAvdaeMgKMwJ5arCsusGGgWM+lX963FwJCzDSU0ySMwXI/jfOsHk/NVimj0qiuFj du+QWiQjEfP8/807qf6//YSOE7PDPDipmaKbmqyyv+MyVqCBJCPy/lfDWURo0aqhleUN TSxUgaJ7Oe2CgoanPR6R16pS0h4oGuY5tISs/Vq0DPURli3h8we8ndW4E0Ws1TY37Dqr +c6V7M51BN3KS8rj0S5oDLeT6+ZOZM3X4g3/58kI5VJB0xn3lWioWCnZFbKE6sjDDEDT 2jAokREs0n9H7aKrEYF2UCLIeIkNOC54Xd21K4m1mF3OZG+1IqJRbojvQrVVrKe3QCj4 JGNw== 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=s9Na8vImvEN9a9H7n/HabthDmta2r2NCc5i/qyiDy6I=; b=COLlDw6nkOjnSzG8t+oXR9H9P7AAUvWLP9ooEjkZBAmEeZ806ZCwevFWWkLH8IEsd1 kNAb3BHSAWuOM25epevOJCIyzNXZB35V96w1I142jJP4xb1f9I4RBqfmojZcQIsrKUkX S9sQ8OAmMqtywoOEw2iluvRfryEwkv8hMyv3c1DjmZKFhsuxMfuHuKkw/XVagUZOc7UQ VjmVJAMMhzey+VRIno5d7ztkSsG5j9LMz8mcweBeIFBMV2n0rIij5Mj9MYuDE5WgztBd X/hNHj4+mnj0Crx3DGxfKcKL32ZpNJc5h96hCtCtsVlah2jG8OCH1xzb5P1pL3u/8Dj1 Q8kg== X-Gm-Message-State: AOAM531kMR2ar5NFwW88Z7obEtxV1vN0zFXyiWy2b3CuKsBumgFv2Bzg PJ5gAbas18r7NyrmWexwg3+l0Dkh3Fk= X-Google-Smtp-Source: ABdhPJzPLs7PrbZcN4oZj/0s42GXV+TIPM0a3QgM/+IWq6LFthR5X1NCf2RtAWWJjedaokvhkTsgjA== X-Received: by 2002:a5d:618e:: with SMTP id j14mr2057775wru.377.1613619778773; Wed, 17 Feb 2021 19:42:58 -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:58 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Feb 2021 04:42:05 +0100 Message-Id: <20210218034214.2090223-20-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 20/29] avformat/voc: 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/voc.c | 8 ++++++-- libavformat/voc.h | 1 + libavformat/vocdec.c | 2 +- libavformat/vocenc.c | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libavformat/voc.c b/libavformat/voc.c index 2a972344d3..89639a98c4 100644 --- a/libavformat/voc.c +++ b/libavformat/voc.c @@ -19,11 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "voc.h" #include "internal.h" -const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A"; - const AVCodecTag ff_voc_codec_tags[] = { {AV_CODEC_ID_PCM_U8, 0x00}, {AV_CODEC_ID_ADPCM_SBPRO_4, 0x01}, @@ -35,3 +34,8 @@ const AVCodecTag ff_voc_codec_tags[] = { {AV_CODEC_ID_ADPCM_CT, 0x0200}, {AV_CODEC_ID_NONE, 0}, }; + +#if CONFIG_VOC_DEMUXER || CONFIG_VOC_MUXER +const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A"; +const AVCodecTag *const ff_voc_codec_tags_list[] = { ff_voc_codec_tags, NULL }; +#endif diff --git a/libavformat/voc.h b/libavformat/voc.h index 1f9a8be000..1fc6bb4227 100644 --- a/libavformat/voc.h +++ b/libavformat/voc.h @@ -45,6 +45,7 @@ typedef enum voc_type { extern const unsigned char ff_voc_magic[21]; extern const AVCodecTag ff_voc_codec_tags[]; +extern const AVCodecTag *const ff_voc_codec_tags_list[]; int ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size); diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index d388fce92e..6cdc720ee7 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -106,5 +106,5 @@ AVInputFormat ff_voc_demuxer = { .read_header = voc_read_header, .read_packet = voc_read_packet, .read_seek = voc_read_seek, - .codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 }, + .codec_tag = ff_voc_codec_tags_list, }; diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 321b113032..bdc63843c4 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -106,6 +106,6 @@ AVOutputFormat ff_voc_muxer = { .write_header = voc_write_header, .write_packet = voc_write_packet, .write_trailer = voc_write_trailer, - .codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 }, + .codec_tag = ff_voc_codec_tags_list, .flags = AVFMT_NOTIMESTAMPS, };