From patchwork Wed Nov 18 13:05:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gil Pedersen X-Patchwork-Id: 23682 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c00a:0:0:0:0:0 with SMTP id c10csp248762ybf; Wed, 18 Nov 2020 05:06:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwSyJx1gTqSG+kfOwcreMrXfFx5DBQzgT1BBOtwHMI3YTcM/AXMqPcCkeogL5/0kXYnK+p X-Received: by 2002:a1c:544c:: with SMTP id p12mr4320318wmi.146.1605704803435; Wed, 18 Nov 2020 05:06:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605704803; cv=none; d=google.com; s=arc-20160816; b=BZZIidvp0Fd9jptMBgsyvFTXDRlk3nLdCllAryYgd0d98ZGZwvpJw73+rwkK7T7Hew H5Bov9KEDueRv3SiVuxGDCsx6gD8j7csBfTuEo/yKTqlLkJj9xab+VhfNDqWV2jVJSga 9RQicqL/55UG6nq8Be52hW9mRwwrIEimwKAln7MWbVVEXHnrm+VE4OfpQ7bz7rCH2rA7 26+sH16TUogHuPvsiLAPZp/70BGnv/gfBQ1RdysUBUlhqy8F5wBLNvxFdw8OdWvEnQiM bATQB6Basy0VhKbA6BwXkva5+gvTK/1YlM2E0duAJ8XBeDblQfIQhqFxbrugUqj1lk1X cTiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=Af32GBKqWM3WSuRT4p1ov4dHW41FPw837LVhXKBQgdc=; b=0TzBXs03jyD4k83aY7Y1g5MiikXOIBtUl1rvqLj7kPflvoEq/i4IgB8aldKYQKk2P9 sc+hgEhU4WBewGkCf/EjhAysFGvG9yqaZ9e35HrHUjqYyMTaZgQ2iQo0h8aKXact2hef 60Vv9i2K+hTMMPWsdFHDUaMn9A0WiGNF/URgBglnWbCq/5r5x5H42A97kCXGgwHVNMb3 arvRjJkuFJiz/Qc7di79NZjRxMzgLx/pHRL+K8fe9zkp8+RYbuRmp8Rdg57MK3OrG52O Q69Ek/5cyFiLfFwBPq9vn0eoKt6iv+7wJPldeMZOTwyn67HGeU39tmVlQ1eKOfFv2gBx REVA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v10si22787176wrr.159.2020.11.18.05.06.42; Wed, 18 Nov 2020 05:06:43 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0039868B5D7; Wed, 18 Nov 2020 15:05:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 031ED689FB5 for ; Wed, 18 Nov 2020 15:05:50 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id s13so2655485wmh.4 for ; Wed, 18 Nov 2020 05:05:49 -0800 (PST) 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:in-reply-to :references; bh=8wugntXnIQ7rRKebcNPvtfXlXxUS7cFTkVQxL936a2Y=; b=OKBWTsIfcW/wRs5CImmHe1fhZll9XgCcXoxsZC0KNYkDRXIMeHFr97pVaSMpN3TvlD VwhkoGAr+ep1js6Lsx+hrs0rC8Sg4iafIl5ELjI8ct9jxu5frsDlj2XGSjYoMAcq4rDB qx/VzahirvundehXJCW/U8YCVl6Mc5EMdxGDiLomxdG/Ygrqrv++tC54Ej4cPvffhjZJ CLh/3AW9DCEHeke3UyES3bqSOqtLlaZ8MHb+eaA0N7M1RjXtMutWyqFvxSynT9CqDUKi lVvmZxS6z7pX1+ak0sAZJrh4jVj+uiZRD5AP99gM8wvHXJ+PazNBDSltDMJ+/Rt8lvLh V95g== X-Gm-Message-State: AOAM533LYZk45KaHEaty/YnI27UiuJxXgCLQyVRKuXWUy5A3logY50aI Mh0tGVl0mpT7Wa3jPjg1eUedJkRx2mVv7s4f X-Received: by 2002:a7b:c157:: with SMTP id z23mr4289930wmi.70.1605704746286; Wed, 18 Nov 2020 05:05:46 -0800 (PST) Received: from ov04.ovh.net ([2001:41d0:303:c09e::]) by smtp.gmail.com with ESMTPSA id y16sm31757320wrt.25.2020.11.18.05.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 05:05:45 -0800 (PST) From: Gil Pedersen To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:05:16 +0000 Message-Id: <20201118130517.585-6-git@gpost.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201118130517.585-1-git@gpost.dk> References: <20201118130517.585-1-git@gpost.dk> Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/wavpack: use av_buffer_replace() to simplify 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: Gil Pedersen MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SM+TwvwjaHnp Content-Length: 1532 Signed-off-by: Gil Pedersen --- libavcodec/wavpack.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index f77548e5a5..58122c948c 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1024,13 +1024,12 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) return ret; } - av_buffer_unref(&fdst->dsd_ref); fdst->dsdctx = NULL; fdst->dsd_channels = 0; + ret = av_buffer_replace(&fdst->dsd_ref, fsrc->dsd_ref); + if (ret < 0) + return ret; if (fsrc->dsd_ref) { - fdst->dsd_ref = av_buffer_ref(fsrc->dsd_ref); - if (!fdst->dsd_ref) - return AVERROR(ENOMEM); fdst->dsdctx = (DSDContext*)fdst->dsd_ref->data; fdst->dsd_channels = fsrc->dsd_channels; }