From patchwork Wed Jun 21 16:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42268 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp2275175pzb; Wed, 21 Jun 2023 10:00:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5jAl1/gUAYctFQ3av9iBqxI/RbgHuZ00hwjyfVscfCw3EH53n5OwyoU730ZsjqoHmiij0t X-Received: by 2002:aa7:c307:0:b0:51a:4e14:d573 with SMTP id l7-20020aa7c307000000b0051a4e14d573mr8419311edq.11.1687366812250; Wed, 21 Jun 2023 10:00:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687366812; cv=none; d=google.com; s=arc-20160816; b=UVMMIM2xB4rPOuOuMErKVWDIlkyPhEGLZvB39FFFRU1PP7Cjri6CZU06lYKBFSGfaT USZcG3/2lQiJxSPn53d0CPBeWCVdHh2zcywpBI2YBeN1mF4XiWEnVC6WVUYGr9vwhbR/ pESFpXN0+1krWMZYLxdImjrFQZ/o8g32pKp5v/yIn74Lk6XryVnBBvAZPUt8a7huxd8g y9QSvHb4smiN/C+JEZNklrXEFhjqiJHlsMqKxnyCfWWxMCssgRc17wF3Qsh3XttYEzkt NcOMGv7tzAI/6Lumj1cvMPKEeeWZ/0xXTWYWPWcpUtmW+EvZjVzaSWsBLhJ4mGzdVPCM 2asg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=01vZPoIBFcPqEBjubRFDpc7lozkG92xjGQpJoYMbWh0=; b=P+amhJMliuzZNVI9B5bTlqpnS0YSUJy8/khYCgbGkl4GiNDxqjh+QjkZmtrF9Gjllq Lp2RDNGAhnktPTgwxz02MNWLjl461yG6eW+GtpXY6yFtoygcQP1TKVnQ7YFO5qtLYokM lVrqaGtu9Sy4QHFA2idcw5vJh+uutgizlhfyb+yo7hZpBNHFptzSGFjcO8GMSQff6KAd Inp3rRWvvHsemW7kO0hFWC/1a7VdeC2wRCwBQoEHzWl2fvJDO460inlUzd448OY8W0pq 9rzyrWD+Ht3Mox06xxqaDbxMkuy3J4TP/IqzbD1rCI5h2NxmQisIGODRKGDNR/qqT+SL xeiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=QBxVnIKn; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l14-20020a056402344e00b0051a5feeddbfsi2412922edc.196.2023.06.21.10.00.10; Wed, 21 Jun 2023 10:00:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=QBxVnIKn; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEEDC68C09C; Wed, 21 Jun 2023 19:59:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 866E068C074 for ; Wed, 21 Jun 2023 19:59:53 +0300 (EEST) Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-6b468ff042cso3624951a34.2 for ; Wed, 21 Jun 2023 09:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687366792; x=1689958792; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+WIEDMLPy8EUJcNmQcJGPH1LFv01pVNLJzAGaMWJQLs=; b=QBxVnIKn0yxare2xCFxXan3QpUycta4+4OYPKI//eGwKc4Gt9+3yLI1q30TESZPWsu w1GufziplWIbxc3n+BSWg5yb2D7OIN8xe7ovAcRH0/k2Y0TrXVzIWt7FVgy2rSk+ycZv DH88UxO/xUEOavMDVhN/381bR4b4b7Wy5qT9oaELrqgYvxuH2E2+k/qGFgFLVdl2HrA1 HiemoO7Hb91MjiFOyPNI4uUgAMEn7wYtUw220a5fz56ET0D42Ke3/hPVPHDPUASueVPk DgJ4rA8hR+muXOcDp29CUI0wZRBKylvchMfz4J7EkaMDUZLE7gINAGaOWwMvGwewXEB6 haKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687366792; x=1689958792; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+WIEDMLPy8EUJcNmQcJGPH1LFv01pVNLJzAGaMWJQLs=; b=exZic2ioys5fk7X48x5X+2DJWepnANsch0fmpmNL+3MyMmb8vmKp08Z/AN9bLutiyO DrdufEV2ciDLV8ww2OkpdCX7mwgoGD9ilrUqDOTi1UCXu1nHT2zewdxKGZKGRH6pMLda 0Ai1iF227LZPCZ5dhQYj2szXJs/fcmMZsfGtacShK4hi1jabmJgVORTPN0x/3+W+/Fbl 4pgbgl8Olyd5dNDDxDUgW2Dh+NWkbm5LsV3w56aYG+qLMCLJLPllnTT3TTICxtbI73KV LRC6HfMdrTNrUqRp0FK4rr1f1qxuA4nnyunNSS56oL06umHCMwt2xuKhX1TR619298Yt lscg== X-Gm-Message-State: AC+VfDy3nO2kTl6UOmR7Yr1BrXvojD7IsgXoKVDWgBFhuzHr+weh5t2P XXdEZooWiH/JjF+5YSXpxLX9uEE4FZM= X-Received: by 2002:a05:6870:32cf:b0:1aa:f3:5b3b with SMTP id r15-20020a05687032cf00b001aa00f35b3bmr16725896oac.17.1687366791729; Wed, 21 Jun 2023 09:59:51 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z17-20020a056870c21100b001aa0d9cdf4csm3004692oae.43.2023.06.21.09.59.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 09:59:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Jun 2023 13:59:48 -0300 Message-ID: <20230621165949.1112-2-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230621165949.1112-1-jamrial@gmail.com> References: <20230621165949.1112-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/evc_frame_merge: reindent after previous commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PervKI3hqckw Signed-off-by: James Almer --- libavcodec/evc_frame_merge_bsf.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index 8af6095bf1..36ffec5736 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -188,18 +188,18 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) au_end_found = err; nalu_size += EVC_NALU_LENGTH_PREFIX_SIZE; - buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity, - ctx->au_buffer.data_size + nalu_size); - if (!buffer) { - av_freep(&ctx->au_buffer.data); - err = AVERROR_INVALIDDATA; - goto end; - } + buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity, + ctx->au_buffer.data_size + nalu_size); + if (!buffer) { + av_freep(&ctx->au_buffer.data); + err = AVERROR_INVALIDDATA; + goto end; + } - ctx->au_buffer.data = buffer; - memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size); + ctx->au_buffer.data = buffer; + memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size); - ctx->au_buffer.data_size += nalu_size; + ctx->au_buffer.data_size += nalu_size; in->data += nalu_size; in->size -= nalu_size; @@ -208,12 +208,12 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) av_packet_unref(in); data_size = ctx->au_buffer.data_size; - ctx->au_buffer.data_size = 0; - err = av_new_packet(out, data_size); - if (err < 0) - goto end; + ctx->au_buffer.data_size = 0; + err = av_new_packet(out, data_size); + if (err < 0) + goto end; - memcpy(out->data, ctx->au_buffer.data, data_size); + memcpy(out->data, ctx->au_buffer.data, data_size); err = 0; end: