From patchwork Mon Aug 15 11:52:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37287 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1225684pzi; Mon, 15 Aug 2022 04:53:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR4JYQP2uJDiOYGJiRm4VrqjZns7I66o4cBYDDpO1Sww2+wBdQC+0Mo1W+bTOvNFEdfROCIf X-Received: by 2002:a17:907:75d5:b0:730:b051:d93f with SMTP id jl21-20020a17090775d500b00730b051d93fmr10226903ejc.568.1660564381879; Mon, 15 Aug 2022 04:53:01 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hv13-20020a17090760cd00b007382da624cbsi4938221ejc.539.2022.08.15.04.53.01; Mon, 15 Aug 2022 04:53:01 -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=JRLAYC81; 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 2E02168B97E; Mon, 15 Aug 2022 14:52:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068067.outbound.protection.outlook.com [40.92.68.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C6C068B969 for ; Mon, 15 Aug 2022 14:52:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UdFWSuw2OSsRADKGgdcF6PLIdn/xD/VZgEV9zJ5uuCK8GlIXsnOK5uqV+NXkZHkopfhbQFlLi4O3sJym86PvYhkKyXggnkSf5+EGeQF9Jm0QpD2GETqHqEFUIujUk6Ufuyan7EehoLN21YbtzZrmX8bemVQC3WYQkirj0MKWEQihwmjm1DGRapL6g7lMHfRUttY7OE6NzeYZ4OJ/gAKqthHpyXIHWqLptdkJuHyfGnSYOXg0TC61AcXuCWg9USYK3wFDPcOcQsMOewDDA6lQfb3NYiJmdjoP9QtZYFPMDFjvLCLfMdwl3xZrStsS9j51IuBDScWce23eORdxALO+RA== 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=/i7XGF83S60ab8vNXP/H6jJszDktWZfkhD8qvX7dT+Q=; b=LiO98NSX58GhhcW/6hZp7qawcoqYrgrNZJiiTrVwVCvxdaDDGqvygil9zr+eDo7bjhVL0IcYBjePKIGCN0jfe9qmAGzP+s7JKPHyndZA0YoyerinRLlK0iroYDdT8FjuF4XuiQGyeXdPc+L0jvf6i2I4kJ619M4/SwwbwoYAo8gslNsfU3glMaXP0bEFgB897ghRMGtZyL6GfNiMB2rWLerXBgMUSi01q4sYbms/jUYeIi7KatTq09S+dDj7yHmfCkAjIms7XsSbxDdDYzL4wypE8nC6K82MNunXOyR6iHTPzwyfMHQk3dd00RWLE40dx5N14C2HAfpVY6ty4bkbpQ== 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=/i7XGF83S60ab8vNXP/H6jJszDktWZfkhD8qvX7dT+Q=; b=JRLAYC81r42A7H0bmlBF24mcdqxCOr2MOf2Gyw9/RcXQ3neBU2YV01tnzQpEFL2Nrj+ZjGbCMb31XJWFaL01On598AZ+xh6tiHt45fcuZZ2v4+/0kchJJ9Yeq4FnmcjKVWatk2qYzn2pkpJ5eVrs2znonLPIB6GNPEQRTvPuZAma1D6OEG/BCCz943TFgIC5CBkXDLv+YCIxkOSX+wx+ut4pJb4XTqMce6ULAOj1fd8CJzYaJtwg31qOLSk6TUcn7aSRh+Uj59NSc+k/FGlI9A5++IvkrG9oOOb7jOE6/YimvAqXl+nQ8SjpAc8c7BLa0AsJz0dOGKJe8SSAYxjYtA== Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) by PR3PR01MB7937.eurprd01.prod.exchangelabs.com (2603:10a6:102:170::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Mon, 15 Aug 2022 11:52:33 +0000 Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e]) by HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::a552:4834:4a95:2c5e%6]) with mapi id 15.20.5504.028; Mon, 15 Aug 2022 11:52:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Aug 2022 13:52:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [T59eWwiNUMbDB4bwHa4KRXR0tiGZq0A8] X-ClientProxiedBy: ZR0P278CA0194.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::21) To HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) X-Microsoft-Original-Message-ID: <20220815115211.2237279-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03ef209f-2ef3-476c-dda0-08da7eb4a3cf X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXnrnTKVombr7KBDDtrDfGKICFMvua4tgRmDYlcom29c+4cZNJFmoEXjzm7u5a/6Tu2A0OoOd1+OG0Wj8VYICMfg39jAy8bZvTe8SgCYhKdytm+7xhrYHzS8l42X+/GsUaPsa5XzAwPv14AEWcjfJhPDnINE5xgOWRdyByR1bQ5zipMfcrZLGoeNKxSYZizoxoRnyB5xr+243+zeAcSKX5tDgbU7QlLCbCI28qtvifkGAuks/mSP3qtK4ppPXWb1+awx0AEplhG3LxMho4dBXIk9son3F00i9enXAdADLkz1geQncHMg+rdTDIhPpIaqi+OQy74YbkTx509tPty80yG1otSMX8mrtiN2FUdkZLEbhD/fnq6t23mHQPq73Fd9g5rS/KD0e8oGkOUOyUbCwKktWK5n1OOx5JyoOZdZic9VLvRUqhUUbFi/fAUGl2cY80fX6HagNSEW060ricLPnKWntg0gnJfg7frFID1sEYo45UcIV1Stn7rfXgVVzOwo0UudGYbqCM7rKqOlc9XhOsRJE1Xc5uRo1QSzmPcONiWYQEPwcvsl4tyoBcxaX02mw4M+/sYrW4NZKa5o5aDyuvhqI3LL6LxWvuuBbAvrsU/FlV7n/VkMqEf8RezPZOopUMbQHNMyCXNL2owFhuPkUsy5uyGJtCaiqMBlwqNfgRf0WwQDHsyX0kxkPRgFM41UHCvsqpsg1Cn+Eokbu6rjD6iTvtIipJdWEg= X-MS-TrafficTypeDiagnostic: PR3PR01MB7937:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wUoflMd9eSgqPxxvqOIAT8+1kd3Pd1OuE2Xkc7sRh9qTtc8ie2YK+4To/R6SR8Dia4RWsXSjYXpk30bqgy8O97OwTbhZfUgJaoVH6t2tx+4RFqvftnKfARPrxUjgp7m2FpKxnCyrgTIl2az946fxOhPa5nbt7Olo2g5NdVG/y3bN5hQa0dxicnm8Hj6LOj0ah5Bnfa3sKZWRNHEbweEN8peY4JXoAU4KS9MP4XvDVdsUkRh6OOVUDqJrA1LNEha9S+7VLVPwCXS8eJ4/Pms2tRmS2khM5vcVJpStWZ6BU7feJw68kRD1QYv/5AHvxYyFsvSLedjzn32cOCx8vXPEn3GVtB/ttlf5A+FFx+Iw2rpqYQhqzQqnmaWQ/DnFUdV2nLdAfOQB/6x9ohZV6gkvpsly5tTCwLNvSvXt1LcKtyQd+KmXWqEG9h5BWQOp10VfHqs1qnWb6/SwohN+z+yxaMPJ1EqHu04PIik6bNJv0f9T0zzk28kC/nBD6wUeUoIk4D5mco4vz8GSN8f6OLo/d7aHt2oNIa2iNeeqAF4aLR6cFsRS1LD8iPd7SdBh/SUnAz9rlifNAJxYE+GNkSoIYawWYu4bhg02w81fveBGWh9JURWovXJVnit5iwd9+EAAf0RBKLwk7osyXp74hs8JLw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: urCeUOW+cYpQM+1ShP+elT3Vvb18TpfRVfGCSctJkVY0tmvap5qE8g0Ft5BjI0NpzmMrJ6UhC0yB2VIkEGvIogDsjqWue1zjYdQ1jYn2jKRch6mh02QnwTDkbam5WLCTwAhi8XMRiE6USh8EI+3PED+ze/vT9mDonhudjmluFQ5F4Mok92I0ALA5iynZzjotPnKFf6Y8WHyRVt7EDWy4BIIcsJuhi5caxaMZtAUrL7r/yMARBF1fn4VNv+BdBAu41XXEhOgdNV9SdRZbbF1L8hef8r/tLxSuDILwLPTZZTHejtnF8VTx0L/NEsBTEuixKo5BkTYXyeS1jNCH+jOVBOVKBPoe8CCk/LQCIaa+6LUR8/o2JJ0o9LtYkcHn6YMDyQMGlt21x5mqcU3bZGMPkEjy83WwF4EY5ClVyPBR0Gqh2OqSRHttdPXB31Y/yI1aMJxWxKrVfwEWhf7PU7sYMzcGcxg+FWgwyE7k0U0uI1WORiCDQdgwZyqEOWlyPYFjnSiW14meP3hC/eMjHOCptGgA/7MKZWyO0MxqQN5QFpS+CsTh8oeC9RHBX5EHp9nZ7JLZvVq8LH2R2BscJ4gbTc9SQEIdFMTWq7VjQsIIRAZH5ulkKPT9v5vR+YupCD2OHSX8jE96Bu6OLiVN0sWG97hgx8OwtQiTrVcG4TpWjMcAStM2vY/Um/tZpeMALThRqBxHY4e4j1YQqXhKIh4hHUESU01OLIlNGnjlEvM/K4Bq6aNizkmH6Z3WemulzF37rhPNleE0DqNQ7yUcC4hQhYy1oLWlq98BINpbTe5iMvBhixeIa1w5es0Odun6DmV7H4CitojoMfRMU4LwoGffEvW4g4uCtByIsaVbY3/IthRIZ9hQIRTqSluF2b6NaY6jfW1pWVrHc64syPXSfGY0XHjEqLjmr3AaTOsQouoklL740A5JG8LguFYFD/H+dI4/xhfrAdT/QBmTLMY7Rq8eYCIQVHwzkbgScKJOhVIUmmNmN/6RTq2moiFrA17fWDIzhSGS4aZB/6Q/vsOgE675so1dhfYS74tumnMjJxK/cykhM0j7xeHVH34OBCS0dtdKl1svurEnoJ7CeAUeRyE+3z/I3NpZmXc6Pgo/noEhotCV2mw4k8dE+Pk5q0DUWsdWZM/b27azepBDZ5scwSlrytf5GthDpjE+U7gEGAeEaamOZ+2pc0W1Y9/DcON7/mNG4By025QHuXrU4CZDNBg0rsrxvQhWynWFfS+1G2bdVkamWhpVM6biaDBminv+zn6RSpkHI0gXBmNoV2bIkv+GEIWnAXtZIX2HEQ14/hUbF2g= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03ef209f-2ef3-476c-dda0-08da7eb4a3cf X-MS-Exchange-CrossTenant-AuthSource: HE1PR0101MB2219.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2022 11:52:33.7149 (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: PR3PR01MB7937 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/ffv1enc: Remove redundant wrapper 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NdrbKjhW5ioT Signed-off-by: Andreas Rheinhardt --- libavcodec/ffv1enc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 6f8b8275b5..90593fbaf1 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1240,12 +1240,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static av_cold int encode_close(AVCodecContext *avctx) -{ - ff_ffv1_close(avctx); - return 0; -} - #define OFFSET(x) offsetof(FFV1Context, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -1281,7 +1275,7 @@ const FFCodec ff_ffv1_encoder = { .priv_data_size = sizeof(FFV1Context), .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), - .close = encode_close, + .close = ff_ffv1_close, .p.capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_DELAY, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV444P,