From patchwork Thu Dec 8 14:07:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39657 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp342467pzb; Thu, 8 Dec 2022 06:08:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf77gk6YGmh6v3RUrLSPYwWZe+Xssg773rm3uH33NFiVoJ0SD5AuEGAHm4RDnOFsB1Y5LyfX X-Received: by 2002:a17:906:79d7:b0:7bb:7d69:da90 with SMTP id m23-20020a17090679d700b007bb7d69da90mr1914350ejo.31.1670508498173; Thu, 08 Dec 2022 06:08:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670508498; cv=none; d=google.com; s=arc-20160816; b=vuFY2oRzXRTzOUrn2mV1sDycHDb7llJsWro/aLb+1s3OzHn7GW84gZakWFn7bQ2DDP xb/Bs81E6mUUzO0DsKAzGrUDO4YyG6Zwt/1nAZ6Vtcn14j+tIHlGu1pRTiIj2Vc2mz1d WOxfPeTTfHS1zQI+oTOEq5R2xvszbqreYxDrRo+LNEg2FfJwq1VZrZUfVXLlcX40GK5B 49XcMLAEm7iaOQsxjvR2Y8QeTusNrT1x5fdjLswXhqWAlIvBncARahisa+zHFimKe5T7 AkLxbeK5h6SC37MjG0wTxICieimkZZJ0OSY27v3H1eatoqKeYuU/nIerqfohRMmxRzRI KbXQ== 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=Yx6T+NefMYmIVBdKqpMjzY2wXDez60EffB9TrWfrMh8=; b=DWoEZaQz8zVXmEDdgNHPfjOlhTskW+d7Ds/I1ZBRZawRWus2QUJUtb4jiwkisHiePA nGeRlASAg5Y8sogaq++hEKG4WeHMMtvgBTuPduesYDZVu3FFrBz+iuAv4IrusOFb3brJ c5S3+rhy8e+dtXFORh+9dGRyDjYEorkeTuiRS5dJOO++OaUfujMSz1c1TKtO6OY6QiTz W8LK5QXOIYkKhtBaKrWyp3ES0dRVb+GXo5qOyuHbZLii/npwvRB3NoBQ4G6Tkn+75FiO AsY+6Id7S72lW3OTK5JAIg1CoJNmbqmLq1ESv2IMtxcTCcAxmF0QezdbGLX4zO2zFSbg 4SFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dgzs5t6m; 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 ji16-20020a170907981000b007833c7cf1dcsi17177659ejc.387.2022.12.08.06.08.17; Thu, 08 Dec 2022 06:08:18 -0800 (PST) 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=20210112 header.b=dgzs5t6m; 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 E5D4F68BAEE; Thu, 8 Dec 2022 16:07:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C1CA68BA72 for ; Thu, 8 Dec 2022 16:07:28 +0200 (EET) Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-1445ca00781so1950298fac.1 for ; Thu, 08 Dec 2022 06:07:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=LoxgiWmYDXRb1LNnZDP5SS8LpRgDHaWKHLbhvaQ2tsQ=; b=dgzs5t6mMGDbKoCH+WTCYfUzYB1HbtPzsF8unhcn1kOehvwZUfFvp7ni2R4rVA1Sw2 0Env7TmtaDrRCSbc6UEZGntN0HQUNqChWUyGKtw+1bwILaJ85xfnlH/oqZdnDx4PeJ1q 7NdLIfam7kNfx2SkTxf8jZYMhRujqyCAuSJiaLnAazCERr7IsAKWTPoy/oqCjI7DS7x7 l8wta1CMeHRIYx7pTXIghIpLjHydhqO3pJa41P3VWAq//FjgTa8zNOVLk2C3LNYU5w1k /sTq5Dv/hUAIhnqymbMcWmL2+Mku14y6yHpi4gQsI5q4tK6ukU4o8I5uMnZqy52eiODT 3jbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=LoxgiWmYDXRb1LNnZDP5SS8LpRgDHaWKHLbhvaQ2tsQ=; b=6fS986AmNLbI/QdSKOFbV3Ep+kYYP1o5qBsVhCXedu22HRZBc869SrGm9v3IoMgB4c C8KVSOj4eU+0+6dXtzOX3tOUwbB7adZ2o7qzq/GRdmEZ7u/w4h7FlPpphz69hig/eRQy zLNgLTLeZng0m4QoDUx6SEtGlkPEWM0D5bG056cQvi3gfIMuM1ek7dsMW32x6+e3z2PP xH3f9pLVtaodDpIdn7QJsc4aE50hT1Op5r6PQjC5HrRe+OtbA8Y2m0+oRPp6bC6INnly QRnLkg/Qb58gKm3Zg9/UURw7F/jlfFmHqanTQQ3BsGy0ikKtLXlCV5enPVAuEyX/mDB0 rvkw== X-Gm-Message-State: ANoB5pnl9TR308jVPyvgUJo8N42FQW3RxLK/gaZ/XoDz/fMP8CkVXr2c YRQnlLFeCq4tn/1mPMTrQPCSQobXwsk= X-Received: by 2002:a05:6870:41c9:b0:137:3ad9:c0fd with SMTP id z9-20020a05687041c900b001373ad9c0fdmr1210612oac.2.1670508446529; Thu, 08 Dec 2022 06:07:26 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e29-20020a544f1d000000b0035aa617156bsm10672553oiy.17.2022.12.08.06.07.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 06:07:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Dec 2022 11:07:06 -0300 Message-Id: <20221208140706.3086-5-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208140706.3086-1-jamrial@gmail.com> References: <20221208140706.3086-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/libdav1d: reindent after the 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: 79xgDIs7MwOP Signed-off-by: James Almer --- libavcodec/libdav1d.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index d9542dd6a0..2f151d2d1b 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -328,7 +328,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) if (c->reordered_opaque != AV_NOPTS_VALUE) { pkt->opaque = av_memdup(&c->reordered_opaque, - sizeof(c->reordered_opaque)); + sizeof(c->reordered_opaque)); if (!pkt->opaque) { av_packet_free(&pkt); dav1d_data_unref(data); @@ -336,19 +336,19 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) } } - res = dav1d_data_wrap_user_data(data, (const uint8_t *)pkt, - libdav1d_user_data_free, pkt); - if (res < 0) { - av_free(pkt->opaque); - av_packet_free(&pkt); - dav1d_data_unref(data); - return res; - } + res = dav1d_data_wrap_user_data(data, (const uint8_t *)pkt, + libdav1d_user_data_free, pkt); + if (res < 0) { + av_free(pkt->opaque); + av_packet_free(&pkt); + dav1d_data_unref(data); + return res; + } pkt = NULL; } else { av_packet_free(&pkt); if (res >= 0) - return AVERROR(EAGAIN); + return AVERROR(EAGAIN); } }