From patchwork Fri Nov 20 07:33:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23893 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 2D1F2448F1E for ; Fri, 20 Nov 2020 09:52:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C93368BD73; Fri, 20 Nov 2020 09:34:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10A2B68BD45 for ; Fri, 20 Nov 2020 09:34:48 +0200 (EET) Received: by mail-ej1-f68.google.com with SMTP id f23so11549749ejk.2 for ; Thu, 19 Nov 2020 23:34:47 -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=BJYSyyAz7qIKZeU8fgGKp7iSe7I/12B5LgbtQiR+EFw=; b=KTDY2uqoZ6Zl4FFjkSL8NB+PMtImrNiKylkJGG82y/U+gd+Rj+OOIkLc4Rxywcme61 M1miRammc9HBRoDVPiOV2QmYlOUr3POuKe511oCTKO194s50ZuUQJUvMCO3oqFeD3dTa /0YSzOe3IT8KdHUt/DbZjj6IM3QCdrknRWWV5tgblJeEAQH9Y4/vFjo8PFa59V5TnmLt aER0cP3OxaQ1AuYTPVmCLMY9yZgVDHyCPg8cZFaN6xUwSkpFzwfNx5DQsaYrVWwUbNyw VInjMK52qO+wCWULPtuhF3wGJrJusdn83TtRkbNNp5WS/AI5kCe+gStbJCsqXxcuEQgh eo0w== 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=BJYSyyAz7qIKZeU8fgGKp7iSe7I/12B5LgbtQiR+EFw=; b=XIBYAMidofQ6Hkwzkchyx10ocDxBVlGconGf5tvkZSDa3AHOclQugHXGc39JQyZKfD uDQ+Rq3gFgWe2bnGXZOO0VYxhfr7lxHhGTroUas69VCLvZWROc21dEkKetXmyJKr3wEn jGSem3swEYOshAP96WIqwJj03X61FhkHe0RIJUkevWYrTZxFp/h532P/+cRdOoizKEVv WiLDWk2d+1yzfkvELPvHjau8xASeB550+FLGFnRwQtvCNxopL02T0l51nO/Tb66yVRU0 uh/hCxSgf/x0Yf+CE2nPcGRbMQM+k0/74k+FbzSFO2YEZrOmtmArPpJkwriHCO+EOgpF 00cg== X-Gm-Message-State: AOAM531GmTeHvMJ7CtZv7zIfqpSNMjElUJPTOLxb5zOtebIlNE1KBn7D 0HSe4B0xtmSgI0U1ts/4/1AaI1yXFUcbQQ== X-Google-Smtp-Source: ABdhPJz1/ZiojtleeSW7ejcK2qqHoS8ZMZZ0nv1oAptwxeobIPwys7QC/A+vJb/5AoFBo6nWW3giuQ== X-Received: by 2002:a17:906:5017:: with SMTP id s23mr33427495ejj.359.1605857687227; Thu, 19 Nov 2020 23:34:47 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.34.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:33:07 +0100 Message-Id: <20201120073327.820745-43-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 142/162] avcodec/aactab: Fix conflicting types for ff_aac_codebook* 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" The header missed that these are arrays of const pointers (to const data). Signed-off-by: Andreas Rheinhardt --- libavcodec/aactab.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h index 7cd8128231..29df6a43f0 100644 --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@ -167,9 +167,9 @@ extern const uint16_t * const ff_aac_spectral_codes[11]; extern const uint8_t * const ff_aac_spectral_bits [11]; extern const uint16_t ff_aac_spectral_sizes[11]; -extern const float *ff_aac_codebook_vectors[]; -extern const float *ff_aac_codebook_vector_vals[]; -extern const uint16_t *ff_aac_codebook_vector_idx[]; +extern const float *const ff_aac_codebook_vectors[]; +extern const float *const ff_aac_codebook_vector_vals[]; +extern const uint16_t *const ff_aac_codebook_vector_idx[]; extern const uint16_t * const ff_swb_offset_1024[13]; extern const uint16_t * const ff_swb_offset_960 [13];