From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 12FFE49917 for ; Fri, 23 Feb 2024 14:41:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E661868C7AE; Fri, 23 Feb 2024 16:41:28 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C8D868C66F for ; Fri, 23 Feb 2024 16:41:21 +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=b3ZrAtdu; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id F27374D03 for ; Fri, 23 Feb 2024 15:41:20 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id VbWmBK-0OfeC for ; Fri, 23 Feb 2024 15:41:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708699279; bh=fXPoo2w+fFlds322ZVhiyWPNc/EfLyjAbaEyEnesDAQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=b3ZrAtduvolsWuMTYJrsMJiVGZF4OCLJyD+OcIKNyvJtUaa8gAD68sFEOOgjcsj3X GF9xzvZYJW9NZrmtryRj6R7xFUSXT2XXeKI4zOvC2cjQsMR+hwGZ3qyfjGPDcVOJVO VmugY9aaaLVmXWyYYu1oRWwBEKloeinryQxbRaVpKpt8E96qaq2/l9mOf+ax+F0nRo MJ+vCkO5CrjjCknAb5Ju3kzBYzqqi19FGDl+WnNuPGWEvRCWc+coHzhPYDzzDcTyl4 TlIACrKPAm9xkDgYEyEKJDL/r6aHTlDEaA2metPVvJwIqcknDR3JhMQ1WtwodZGgCz y+3ahUD48cmFA== 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 C120B4492 for ; Fri, 23 Feb 2024 15:41:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6BD0F3A2715 for ; Fri, 23 Feb 2024 15:31:23 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:58:56 +0100 Message-ID: <20240223143115.16521-35-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223143115.16521-1-anton@khirnov.net> References: <20240223143115.16521-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 34/38] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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) -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".