From patchwork Thu Apr 9 12:38:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18795 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 306B544A1E6 for ; Thu, 9 Apr 2020 15:39:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BB7E68B7B6; Thu, 9 Apr 2020 15:39:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDEF768B1EA for ; Thu, 9 Apr 2020 15:38:58 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id f13so5149266wrm.13 for ; Thu, 09 Apr 2020 05:38:58 -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=tblC6QFCgSkyJlnAoyLqKhFsteBd1Uyr7MaUmqLFiL8=; b=ITu+VPUUHvqvW5UnAB0vMIk8a76Bo5ZiQxljUrmBXlKw8/PvRD5kFFEypUUylt/kkg W3wixwe0tRwJJWqID66sL+6lPddBx5eH1WRcBqrLe+G74nE/VxDcerjmT5E89nnbkluS OqajO9G60ydKeMsAsDz0hOibV+ZSZYtcAB18vh2kG5mKf8xMG/+lBcV2CJjuJjddq599 WNkWsT8Wg0k3aT36ZG+mKz+swWvYafv6VZWq4bsgffrOqG6Rg1sWKJJjOKEnqfmR/KVa tw/aM3QTYYTvFWW7uD8qWw0HY+UzQN+LbAreJ4yLBtneO2FwbWPeTxc4x6iUsjRWPz89 cNHg== 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=tblC6QFCgSkyJlnAoyLqKhFsteBd1Uyr7MaUmqLFiL8=; b=DVNFeZzoz9fO8N0kybdgXNcIzLVvbSX94eARPoLeaYtRgB5pDPJqkjEFuvYlURQo5C S8IiOdqMdqMqE+mJNrmmLHvQ5orWwg4RrSvQ9Z4pUl8sQAqcOA/19OJ0U/b1mlKEk/K9 mIwodMZwvWv3CtqCQk5+UegISuq2PNsx7z6PvIuiynyiAnm8zIl8KCJTvSBgssBaK32i ihDWm4/NtqpJTYbG4YOFd4ytN1aGHNFmbGymchVKxqtZuGdi/EdcEuSLAJajrrI4i9Lm QHAz384oJLy5Gj0EDb/Tcq8ICsFL0Q3p7e7XCS2xY9xPucZ75ituW2BdfbdCl4XbPiee UFYw== X-Gm-Message-State: AGi0PubExOYWpliFHZTQCEwJ37AyBCr+8IOwcfBm1QIIQuSuqQA8Fb7o wSpEm0h2AloABxJfIgBTgbk0SZSS X-Google-Smtp-Source: APiQypKH+bmGGCls/SeQJ4e+XMBdve+tHXoz2qNrgl2YHr4T5oVQ29jlENg4c9kyq1HBb7XiZ59Njg== X-Received: by 2002:a5d:4fcf:: with SMTP id h15mr13853996wrw.262.1586435938090; Thu, 09 Apr 2020 05:38:58 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k14sm892710wrp.53.2020.04.09.05.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 05:38:57 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Apr 2020 14:38:44 +0200 Message-Id: <20200409123844.25208-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/jpeg2000dec: Fix mixed declaration and code 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/jpeg2000dec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 846e31d0a2..9684e57b34 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -862,6 +862,7 @@ static int get_plt(Jpeg2000DecoderContext *s, int n) static int get_ppt(Jpeg2000DecoderContext *s, int n) { Jpeg2000Tile *tile; + void *new; if (n < 3) { av_log(s->avctx, AV_LOG_ERROR, "Invalid length for PPT data.\n"); @@ -879,8 +880,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n) tile->has_ppt = 1; // this tile has a ppt marker bytestream2_get_byte(&s->g); // Zppt is skipped and not used - void* new = av_realloc(tile->packed_headers, - tile->packed_headers_size + n - 3); + new = av_realloc(tile->packed_headers, + tile->packed_headers_size + n - 3); if (new) { tile->packed_headers = new; } else