From patchwork Fri Aug 21 18:07:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Bradshaw X-Patchwork-Id: 21803 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 472A2448FDE for ; Fri, 21 Aug 2020 21:08:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2229068B32D; Fri, 21 Aug 2020 21:08:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D58F8688083 for ; Fri, 21 Aug 2020 21:08:05 +0300 (EEST) Received: by mail-qk1-f201.google.com with SMTP id d131so1959988qke.3 for ; Fri, 21 Aug 2020 11:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=jGKQYyaLo5Fp4xE5gw8I7ldjlivIg5+e6MgwPIgDizo=; b=cDJy3mXQJZM8Bck6WFKjeIr54CvM3W2OxbePkVJQVBDIetIZimJKJRqhNBWQWH6pM+ y4v87B4hr2AEm5czDzthDHvB+N01x93He0t8ewxloDyJx3odi6SUi2ehPLqpMSH7+Y/v kOf/nNjrHkhu0DAYjTkUO7VeG4WYT1M+dywjIpGfkdc1mfP24EsSD6y4250Q6Vunm+b/ tWKmA4x8S7E48wXYbsMIfiMB7O+YcAiB3bKRinPqDWRpZbmhyC4ULWiUxXBHGYP+eg7E NFqcEP3W4sWTVoQw4o14V6dj7jBecBPz2OrQ9ZL8EkLZTMUF80mKyDgb3XhydxQwIKR1 vulg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=jGKQYyaLo5Fp4xE5gw8I7ldjlivIg5+e6MgwPIgDizo=; b=a/KReWK2kKtjUERhCfvcUHFsFBSDlZTg51gRIThd5W5q1AtBBc6xzC1yaMBTm+DVvE tJTSfQQ9eqKq896QfoCuwKQIZ1A/oRqtgH/EimCx1v50SQpLuFC1f3FOf5k1tLniIWKv n/t+Dt1BUaxG+/Nlcq4DX91+1Ir+qnsOuFxWTfFiRU52K50XKIF7m52HMrrfet2DpuBv Vbh7EtCmXICbR8rhE7bGPr7MuK9lDGIWZz4oMTbN5naeMcjtItpEU9VbjvtCAZZyLnid TcVFwVBYnUgss0xzFaf3PmPWpOC/x5HVtQjYCrH912GM5XPMr0IqRctURLofTvHWWzia WzkQ== X-Gm-Message-State: AOAM530S6NgUs52wAlusSaV36QPwJ+qwWbiJBaWkPjw1Bs80atWN9H3X egCr3QwAprfRxEuenuzOWOnmwCX8s0bavhRA0lIsU+OEy4NQFZ3jw3dycMPw0cgblkJLKO1RGQ2 NVbfkvPYa0V4Rh27x2LrV+STEIiFh3thkh20m4E2MkYIkr845E/UJNKmvkna74kX7qQ== X-Google-Smtp-Source: ABdhPJz78DeH3NEX84VXECw11GrUpVKqMR7fdPtSaBOgoTkIwysKRVes/v1WQG+BrvO2Yaa7VPs0JNjttR6m X-Received: from mjbshaw2.sbo.corp.google.com ([2620:0:1006:111:f693:9fff:feec:45c8]) (user=mjbshaw job=sendgmr) by 2002:a0c:f74a:: with SMTP id e10mr3548889qvo.128.1598033284018; Fri, 21 Aug 2020 11:08:04 -0700 (PDT) Date: Fri, 21 Aug 2020 11:07:51 -0700 Message-Id: <20200821180751.2286218-1-mjbshaw@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog From: Michael Bradshaw To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec/proresenc: infer array lengths 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: Michael Bradshaw Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Bradshaw --- libavcodec/proresenc_anatoliy.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 1128978330..d1623e142c 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -49,15 +49,15 @@ static const AVProfile profiles[] = { { FF_PROFILE_UNKNOWN } }; -static const int qp_start_table[6] = { 8, 3, 2, 1, 1, 1}; -static const int qp_end_table[6] = { 13, 9, 6, 6, 5, 4}; -static const int bitrate_table[6] = { 1000, 2100, 3500, 5400, 7000, 10000}; - -static const int valid_primaries[9] = { AVCOL_PRI_RESERVED0, AVCOL_PRI_BT709, AVCOL_PRI_UNSPECIFIED, AVCOL_PRI_BT470BG, - AVCOL_PRI_SMPTE170M, AVCOL_PRI_BT2020, AVCOL_PRI_SMPTE431, AVCOL_PRI_SMPTE432,INT_MAX }; -static const int valid_trc[4] = { AVCOL_TRC_RESERVED0, AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, INT_MAX }; -static const int valid_colorspace[5] = { AVCOL_SPC_BT709, AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_SMPTE170M, - AVCOL_SPC_BT2020_NCL, INT_MAX }; +static const int qp_start_table[] = { 8, 3, 2, 1, 1, 1}; +static const int qp_end_table[] = { 13, 9, 6, 6, 5, 4}; +static const int bitrate_table[] = { 1000, 2100, 3500, 5400, 7000, 10000}; + +static const int valid_primaries[] = { AVCOL_PRI_RESERVED0, AVCOL_PRI_BT709, AVCOL_PRI_UNSPECIFIED, AVCOL_PRI_BT470BG, + AVCOL_PRI_SMPTE170M, AVCOL_PRI_BT2020, AVCOL_PRI_SMPTE431, AVCOL_PRI_SMPTE432, INT_MAX }; +static const int valid_trc[] = { AVCOL_TRC_RESERVED0, AVCOL_TRC_BT709, AVCOL_TRC_UNSPECIFIED, INT_MAX }; +static const int valid_colorspace[] = { AVCOL_SPC_BT709, AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_SMPTE170M, + AVCOL_SPC_BT2020_NCL, INT_MAX }; static const uint8_t QMAT_LUMA[6][64] = { {