From patchwork Fri Jul 31 11:22:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21402 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 9DDC244A7CB for ; Fri, 31 Jul 2020 14:22:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B51D68B815; Fri, 31 Jul 2020 14:22:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B5A568B7CB for ; Fri, 31 Jul 2020 14:22:52 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id o18so31044057eje.7 for ; Fri, 31 Jul 2020 04:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QuWfJP6R4unTFgHcPjlwx7uG6wAoVdH8Qimyc/guKxg=; b=ZhyA50ROVw+dC7lHA3O+DFWvV7acEbn6pvL9JQanY6lomrvkq4J1WyGxS5CIRTpkH+ TgyiJjYAACAg51CjWM6jqWWSQT751IfZSBNpKoEi5beEv1ilZxv219jmbOQTyjGe0wHR luEfRRqm7I6HzRr+sInohERJbe8iymc4v1Hl1j4BSqhT5ccYO4DTVR50u7xHDWcG/EWu MJnVz3J0vQIWMlQMzPZF0F3JvXzkqQOwJhm7Qc8TpKvqCn3hz8SHA3M1OypPmjyx1fQf zJzWYDh0nz77aLx2wRmLHa1TSZRmn8QKDR4pEIsnisW84hAumw7T4h+ovp7B/+Va93+0 JWtA== 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:mime-version :content-transfer-encoding; bh=QuWfJP6R4unTFgHcPjlwx7uG6wAoVdH8Qimyc/guKxg=; b=syVvCaA7/Xi8H2kvKleX5azQjJn9uYkAhO2EBXa0vP91nz1WHTNJrVG+rqkSKvMV2D E0A6XBAcUGAEi4vDyxv6KHEMZiSKDw9pt5bK9ATCYh12cjG6rVbpq3H3Pph7jZYBCMDC zv+A/ayx9GHcOPNsUEOcCe/AJoo/BDecUmnWLfQwNiCpe1PLvD2MUYxDWOun+KFxVgOf ob9BJ0uHUKV6MnhwlwIRfEHuvFMnQBzvITxNh9XCWhF7yGA0+a9BYfhLUqxA7N/aXz7/ wOuPY2/k6NNT4w5WWi3ejE4L78ODSG3OzkRIUZYAGFdiwxA/CWMhCV0j2AhEGlvrYFvi tL0w== X-Gm-Message-State: AOAM5311O+X9xpQ0hWfuaME+EyErHLJjLIbGKZTSapPKtmcEBV05NWll FJPO1WyknNHCZ586lzk67Ax6zXpq X-Google-Smtp-Source: ABdhPJxHVvBwDZgQa8pbqqzFk0Mv2nIKnq5CM+r8qaq0Rwa9cQQEMnFofmh/AsvetL0h8kur2eIiWg== X-Received: by 2002:a17:906:25c4:: with SMTP id n4mr3496153ejb.3.1596194571126; Fri, 31 Jul 2020 04:22:51 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id v22sm9284279edq.35.2020.07.31.04.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 04:22:50 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Jul 2020 13:22:34 +0200 Message-Id: <20200731112241.8948-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8] avcodec/smacker: Remove write-only and unused variables 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/smacker.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 9f054f071d..e53183318e 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -59,7 +59,6 @@ typedef struct SmackVContext { */ typedef struct HuffContext { int length; - int maxlength; int current; uint32_t *bits; int *lengths; @@ -72,7 +71,6 @@ typedef struct DBCtx { int *recode1, *recode2; int escapes[3]; int *last; - int lcur; } DBCtx; /* possible runs of blocks */ @@ -116,8 +114,6 @@ static int smacker_decode_tree(GetBitContext *gb, HuffContext *hc, uint32_t pref } hc->values[hc->current] = get_bits(gb, 8); hc->current++; - if(hc->maxlength < length) - hc->maxlength = length; return 0; } else { //Node int r; @@ -200,14 +196,12 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int } tmp1.length = 256; - tmp1.maxlength = 0; tmp1.current = 0; tmp1.bits = av_mallocz(256 * 4); tmp1.lengths = av_mallocz(256 * sizeof(int)); tmp1.values = av_mallocz(256 * sizeof(int)); tmp2.length = 256; - tmp2.maxlength = 0; tmp2.current = 0; tmp2.bits = av_mallocz(256 * 4); tmp2.lengths = av_mallocz(256 * sizeof(int)); @@ -277,7 +271,6 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int ctx.last = last; huff.length = ((size + 3) >> 2) + 4; - huff.maxlength = 0; huff.current = 0; huff.values = av_mallocz_array(huff.length, sizeof(int)); if (!huff.values) { @@ -690,7 +683,6 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, // Initialize for(i = 0; i < (1 << (bits + stereo)); i++) { h[i].length = 256; - h[i].maxlength = 0; h[i].current = 0; h[i].bits = av_mallocz(256 * 4); h[i].lengths = av_mallocz(256 * sizeof(int));