From patchwork Mon Mar 4 13:06:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2790023pzb; Mon, 4 Mar 2024 05:09:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUZXalNayj8ye9sKcmadMocJ3l5xp+40U3enkO+xxE662lb55iu+zNHDSzq/YOP/ja3VMF7O8akU+85YY9U6zw2szwefMGBxrk7AA== X-Google-Smtp-Source: AGHT+IFCYb+87JO76DLLpl1c/x8Q0UdlAG/7Z+tT/IgoGsP/1HIQLA5+NLT8fkYgin/t1E1RLuhQ X-Received: by 2002:a50:85c6:0:b0:566:4654:4fac with SMTP id q6-20020a5085c6000000b0056646544facmr5922483edh.5.1709557790240; Mon, 04 Mar 2024 05:09:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557790; cv=none; d=google.com; s=arc-20160816; b=Z3Hov7a4u1uzdslmy8z3UDHN1NMh934qOP7y01E1kHm+Kr6evxGVO9oVRLLSUYEXVh 96/seJ+MJMIcnGnM7L9hlp3jzrewGEZM7KgkVkipseTEHDkur9dAsDz8dygrtIs3gXVW 46SBzSkdWqgffmLR/cW0NVGEjL5zce9p2u2Zb0nvV7CTZ3tPBWW7ZUNTu8vCd031PTCg WJo4HK9NkKrJmU0FqkVvbqZsBjmAsF/gt447jAJoMJF8YolU1ptLf6ivMd5SUtY+l+Q3 dY4SNSjboLGqCOdCzAieLZEfRC5drlVPB5y0CWQs1JGKcX8DWTekJavhU1JYim1kTBwn XKuQ== 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=0uci1rwm1ZLtFlFMfXt7vWVfOjZF0VL7whdSEvNPpkc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=mRi1e6eQtYc2n4S9JQ6NvBzysFdiulxCq8t34W8R9q0DBq6mb+2IG02KDOB5U8aGJe U2AUtrQTFykmg831C7ikaeEwACsY8bBR9mRndcIzqxI4CpB3lVFzkH4F1tK3EmE5CzP/ 3fWX/SGqFIS2M+ZKdTiOxKiNUVvuG6o4YNELnyHPVbKbIkmyKqN+WYFOIqHT5QuL1b4R f2ZqqY3Mr9KiGHN6nbPiFXYRaTYkcIyAxgv3ozPdhZYFPQR0fqVkMqvYv3BJs4RfRkq5 2tVrm9oRPwDzLDvYx/bSNP/5ZPoJ0t5f9hI7jkJq2z2R9OngT7ljVfZs8N0DO82/xf9f eh1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=DJUSSKFA; 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 b6-20020a056402278600b005668ffda6f2si4161290ede.5.2024.03.04.05.09.49; Mon, 04 Mar 2024 05:09:50 -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=@khirnov.net header.s=mail header.b=DJUSSKFA; 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 53D4E68D492; Mon, 4 Mar 2024 15:07:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82C6768D446 for ; Mon, 4 Mar 2024 15:07:14 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=DJUSSKFA; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id BDDAB4D5E for ; Mon, 4 Mar 2024 14:07:10 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id VGtjGwify6l2 for ; Mon, 4 Mar 2024 14:07:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557626; bh=LYhgsMr0GNWAXNFi2S3A4R22yoenA2frxt7CWe8xIVE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=DJUSSKFANtKKjFgz4j44CDbaZTApBWOYlqXChJpt6Q4l39yiU1vMA9hHNfzLiqp3T JhDSLVDdOcewVVYnBKEC2Hh+d+0QN/LIxLxg/d1Wvr4/Efrqnu6yhSOTbWiL0GeXi4 n0jzdlNW9Bo0JnK+a++6Pb1EwasUrY7C78C835UfV0aeOTxvMo1mSQbpd1l90Jgy8y rPY3CFZwCjrjkzJQ6E/kbD/Ewr+TBDS3WIzmYd7yUi35214yYw3eBA+nuKOWlAR7nZ WRVYjbG2/Hkx9wqE6eszWQdRap9o+ToHfkLX1wYYQgyOwgVsB47R6hpyPqBwBsKJbS lkapVHXKT+gEw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id AE1024D6D for ; Mon, 4 Mar 2024 14:07:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 0D51D3A1752 for ; Mon, 4 Mar 2024 14:07:01 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:40 +0100 Message-ID: <20240304130657.30631-25-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304130657.30631-1-anton@khirnov.net> References: <20240304130657.30631-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 25/29] avcodec/snowdec: use ff_frame_new_side_data 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: +TyEnb9DINYu From: Niklas Haas For consistency, even though this cannot be overriden at the packet level. --- libavcodec/snowdec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 70fbab9a49..97aea748b6 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -787,11 +787,10 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, res = av_frame_ref(picture, s->mconly_picture); if (res >= 0 && s->avmv_index) { AVFrameSideData *sd; - - sd = av_frame_new_side_data(picture, AV_FRAME_DATA_MOTION_VECTORS, s->avmv_index * sizeof(AVMotionVector)); - if (!sd) - return AVERROR(ENOMEM); - memcpy(sd->data, s->avmv, s->avmv_index * sizeof(AVMotionVector)); + res = ff_frame_new_side_data(s->avctx, picture, AV_FRAME_DATA_MOTION_VECTORS, + s->avmv_index * sizeof(AVMotionVector), &sd); + if (sd) + memcpy(sd->data, s->avmv, s->avmv_index * sizeof(AVMotionVector)); } if (res < 0)