Message ID | AS8P250MB07448E405A4F9265BB9CD8778FF12@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | eac8dcb1871c4e16c7288d7f447067a4d41b345e |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141256vqi; Mon, 27 May 2024 19:49:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUSHzNqt5O3sItIS/2rHqMfmsJUPqaihgg8XesthfMqAHVhwksxeHLPd8cqRNwLeGfx32UstZAzda1PYMnQqd5b/blQLQLVpGy/Ew== X-Google-Smtp-Source: AGHT+IHYvKTBQppzJ9MCN9TX6rhXF794g5Zs9dXdeiZ/9ldWBEEyNFc1GlsWdHbuWujciSI74vbT X-Received: by 2002:a5d:5989:0:b0:357:3e5a:6c90 with SMTP id ffacd0b85a97d-3573e5a7b42mr6028586f8f.57.1716864578072; Mon, 27 May 2024 19:49:38 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a626c8019dcsi457348566b.121.2024.05.27.19.49.37; Mon, 27 May 2024 19:49:38 -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=@outlook.com header.s=selector1 header.b="LnDL/9oR"; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90A5468D4F2; Tue, 28 May 2024 05:49:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC0BA68D4E5 for <ffmpeg-devel@ffmpeg.org>; Tue, 28 May 2024 05:49:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QFiO8Ycy8iHv/7IrBp1rLQxEyQk52zTmXV7biCQoXnbtqiDX5S0wlg08qjg5YMALypCPmjk+LDyUzH3UE5jLmo2GeWdRSsH1PMvyswMVaNu/PHnekoT1KrOvXWxdBQFljrbVn/8ibTB6wG8gvN9fHDZpqEWZMsZRfpQNtRHG9PrKfYrGXnb44BqYBB6y9++phaEGxUJwv548TDVdpn0Rx+P+9p1QOMYehn6P5tHoXV5Nbng6o1sKUfYDyNnx9UGGTrP6NMBFzZmSrQ4OLAzsYOhSu9uqOlXI2gQVDxnuSvm9UjBoXD2f+MAD/MpqzsKOekzoocskiKHPrt7TFLY8pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ffmxjmslxHB7qiyzbErJ8KfNZ8RcXwxFpBauuBKoodk=; b=UISiGLAcInRBY0XT4BGcJAe2C8LGz9A711LK3h63UI7ed/p25guYVDa2b5gu9uk2JB60XJvhqB2k4PJ8hHmCZaR2HY4yp712wHn+DxUDC6ltFgQoxcvY5allQ8QR2tOMw32NgYe0GGGov34v1x97yrGEZft4+TOfQcK/q+KRnrzhxhhCHT7Mua+YrDf+/v9IH5ItCjpsCl3X0gnZ5VHdlUtpuJM7XRweMDtOXE6+EOAT3U/rwfSaFIjq54lGuZKnppO7MMOwRZBERcvZaMrHsl0gH6dXybLwF+cCm+x3/rTQTn5SflcVGXYgKS/Pj0hO6BpaXa4whfe8VV/29uX+dg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ffmxjmslxHB7qiyzbErJ8KfNZ8RcXwxFpBauuBKoodk=; b=LnDL/9oRhk5zERjQRdS9nUFwiTMynceDy1WuRypBYjYt2nN797UYkFhWHCxaVesR7LN+xNofJA/jg+IJzmXvw+lNXX9XcD79tclQKRMdmlwxfqtWWLyLIaz1/J+ALL1Dd22E7QyiQWFIqrU0uzAmwaHmdRD4WqWbn+XaLNJZlir6X5aymH4IWhZelVPal/lnaht1JXSIiSCb+7L8oPkECAGMbhSpH154xjP3dzY96HJdeABNkYpXYgPJkQ/ROzyYWdVyH8gXBhj2fXLbQ2+y9Pnz5tJ0YreKt8ItRFN+hDAq358MaqyYB5gHbrS++aJL74Q/8PjsyCynQxoReWIuAg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:21 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:21 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:08 +0200 Message-ID: <AS8P250MB07448E405A4F9265BB9CD8778FF12@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.40.1 In-Reply-To: <AS8P250MB07442EF03FD5DC8CB1FA9E1B8FF12@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> References: <AS8P250MB07442EF03FD5DC8CB1FA9E1B8FF12@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-TMN: [jmvmXWCLzxORL5WlNSdb82H2ebkOs7JWLEEQejMVHls=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: e6b96c97-430f-4291-fc4f-08dc7ec0c6ae X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 44HKyopUVcscOwjX9W3gc816vAzGIKI4AE8IRf1x4f2vITLMX/4oRdt6vvSmr0oPVRzTdX3XnaV5hK9In1TjWPsYE35rZMiEhjufJIdapQLEzqT4iH1beYC4B/BduPHxIqIK+fHyxuPDBade8f6nZEjVH+G4KnLiwObSN0VH79tx1I4w4mDSlMMcYaiFkFE0DRb7iSoL8a3V4EhmYDkMOgglAnkIn7eKfdCzsCDyOfsgYpaGRAWOt1pXmxOrZobYZDbgMDon5rjzGLgLitcGbl4IH+TC0OMvvBPSpxC/itDTjj4XSgHQjNcfnS8YR3vnysAWCJ/TyBXUeKQwoa6iARGyPV3dtxGZ6ja0x7JOSGaExmw6arHBizkGmTV7tpUGIqrO+HSvJH+0U+hTH9gEf9B3kXrBymEXBuCWggUnEioBYeLjihIg/SxLtz91NOUGtdqvwVjwrS4P8sqIkOelZUrqQz4YNk9lPtKYtpdbv0rWRAuXbRJluHIpb/FE8kIA2K8TF4RywoEG1Dvi5EzKCqtqQeKLFjozWS+usPht/LBj6dS0NPklz2+xxK5B/Z+8Nxk2j28yvD3SGuxkVRrKSxSw7wsR7Ah0fCWew8UM21cwfw361vQWCcYRhQaEQT0B X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qodGt2QMq2YV91Bc1HiEgvPupKGehxlNAZLcc7u4ynGyJkK5lK82vu7+ndPBFUA+W1htZeuegnRhQa06w1L/XVU4YMK1kDdXn9hLcaQvOWp81MAy1qAD7VAvzHQfLq+kIhqMnY6BuOipeWpm8unelVFqXXV4EjnEiFZps4YkXa7GPDRlUr8RedmndlPdjxv3mUcTXZk4LVIcso8yXzLYVfEVuhRDoFhGQEKwvRCxcZVJdT+T7SNGCFFkY8HjTRb0t5Cf1F3miL7RBPERTWZ1VLj6Sxjh6Zbdmizs1r3rfqiBreCHDr2BGytKaEqeAG5WsMffMR1PJdTNOu8Djp/B808SaSVzsLoTzk12Hz4cSPoWiH/F0HuG3Q5ClStwMGyPpSb/R68ehNxVUQcveOBAWFmv0y3Gf7i/IBCzGpPTU97Ax361aA+AubEfmXDHRh/j/c2ECripkVjN3YzeJ71eMiICEi9vxpV9tIBn+ZUVBPtsDdg1Ce911nE6plRT2nEKu0RvA4zccPfmf/X0s+lWfI9oaBKCyCHrmPW8QD+3NX7S7+fq3oyTeH7tqAUaZeFhiTqJvPTsQf7LF7h6abqgbPsF+sByqDbQ+g3FHYTfVK5PjekpMhj/4l2bj359pCLx6nwZ8skDWAgZIcLVL/ZbmD62x23udURIaPYSUdLhRmQVsN2+XzLf+C2UrKaJEPnJafdGK8bFvjJ6yssieHPLpGexhGyDsVldMYPOz25ipgIFy56EIPx/IlxEjFsfBfo5nF+FboUztuxUp/mbmXoWKf92C8S8OC15uBN0nXafzACWpm/4yDo4SFugLD5SHok0UcNT96ll+8uQa57Q8NVnjZz9FvNCtL8m9rUdBP9d4iXMJIvIVZ+pdSAQmShLNtN5wgGNOyvJxJCDXS9+4V6ArV0WyKWRcL1LxnyC4TqWEBvZOS8zYMlE6yl6OsKI3v+N1k/2UEaA6adnV1QHbnEx+wyLvnZ5XAXrOcl6b2xvgOQ8lmXrpLyovv0mL22j8XrVfMxFLmi2MzhepLCtUAvBzsONNNdgfFJrTDJ41mp3MStCqg0YW+2ozm824XnNSjIDRY9tP8LEESiB7GX5jtKFnNNGk87G4IQ+2ezyU7wbrDnrPnQEiE9xPflqHDTEBZfWSkVUoG0HZRXH+lpUwj+u3JJItHg4qcygE+CoYCL2bUDULw4x6Ln/iti1gupJW+7Tj7TpYrxh0qM9bYzbYdu7W3cyNsDWLmQrH8vw0tHc0IztUFRldIAR90BUAVBPAK0ootkvimQn9KHS7iLlaZ80xw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6b96c97-430f-4291-fc4f-08dc7ec0c6ae X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:21.3961 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/vc2enc: Remove superfluous error message X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: ZB3XaI9VcaDH |
Series |
[FFmpeg-devel,1/7] avcodec/vc2enc: Avoid void* where possible
|
expand
|
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 4dcf423ef1..f39f368181 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -918,10 +918,8 @@ static int encode_frame(VC2EncContext *s, AVPacket *avpkt, const AVFrame *frame, if (field < 2) { ret = ff_get_encode_buffer(s->avctx, avpkt, max_frame_bytes << s->interlaced, 0); - if (ret) { - av_log(s->avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + if (ret < 0) return ret; - } init_put_bits(&s->pb, avpkt->data, avpkt->size); }
ff_get_encode_buffer() already emits an error message of its own. While just at it, also check for ret < 0 instead of just ret != 0. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/vc2enc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)