From patchwork Sun Jun 9 09:54:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49738 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1936108vqo; Sun, 9 Jun 2024 02:55:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7ooW1DACuG2r1Zr0iFuWBOu+5i+fFosHznXWt0GESbqpT01z1V+MACReXOMbYIoiT19Hkaigw/1HHyc3Q0SvdeuQFLS/+E5cBAA== X-Google-Smtp-Source: AGHT+IH1jOl1K5JQSu1RqoqLljzpjyUi2zt3BBhbFwc6yn256pwilQrivDnLkuK2qZMU7BMzIC+C X-Received: by 2002:a17:906:c106:b0:a6f:1e88:d48f with SMTP id a640c23a62f3a-a6f1e88d574mr10003966b.62.1717926947256; Sun, 09 Jun 2024 02:55:47 -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 a640c23a62f3a-a6effd5bf92si148272566b.475.2024.06.09.02.55.46; Sun, 09 Jun 2024 02:55:47 -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=Logip0NE; 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 2FA8568D7DF; Sun, 9 Jun 2024 12:55:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2100.outbound.protection.outlook.com [40.92.91.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50FB368D7CA for ; Sun, 9 Jun 2024 12:55:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k8I/y8oejx2twTn40+kQrssfcoeghkg9R3PAt2L0sOmyUFi+gcltT0zOx5bIyq+sgkQVgLkx/MB55YojJcUspLJSnrfvaaD3dE984aURRVkXvVTyEFVfSXLLLdaYKkdqs/Wwo44RMpYugToDpxdZRjI5AYVzM8t9cZ1fhXCxfOlNSCk3IiY7kXGYIRCJtKsS4+VX/Dhowm2ep9i/MhxQQvXmOOKSsUy67a2yZej3ymXx8e00bfl4BWVkc4ZU4zl+PKUmaVmfvaHkGBkeci/D5ha3Ozomoj6dL968MruKixFQ2RuYKf/kCAEjH3Fq2Zd72Zp8Fe/fLtJPyuz5h/38Dw== 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=hKS6jpDpKYSOeyM2QalFfcpO9q36D07Y3AIuYllkgSw=; b=g+vv7Yu7WOK5WKdcOl7RiBviZmZuTrd1fssviDC9hVnS3QgrIMSRGylWoQC5Gg3/G8e2CF2BPveZhgWliM+JWbPomNxKpdWc7lZ15O85bBTtc440dcrX/LviSsBYGjrxtXSbBjWOP1Bzr6kEDA/FVCmwvcgWiWyecoHIY0SB4bb7SqNZQ3uVd8AqQX6lmAJdM9eZc9mQRa/bXb4EkcPIUxYovIGFAlu9uU4HvkepyA7sitFMABG7SFXDhs7k3BcnEPaY1Wkw4QsrRle0LQ5/elGYQ9Nt4KF69tWFMQ6v5V/YcORtOU1hKE1Mskn/uwDcVTWagm+6MOjhqxLj7Q9tQw== 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=hKS6jpDpKYSOeyM2QalFfcpO9q36D07Y3AIuYllkgSw=; b=Logip0NEeCP236oBn/vVELR2MVTuy38sRUg591gv1MWB7IlHvrAKFgE0C/s7gf2lA89Kp3EBqEYJshWDizkegv2didUsWJYZu0SpvUJ2zn8pDDHrhSpabgKFFYTO0ks+68gXau9R5pElVxpfBYpmWOxjAHpN7F4vx5SRgKP/YViDaxLuBg03TPAD4kEO4CTWdEyt9xY9A/iTVA2CBag4mAtcQQt+VWfes+edkyY/BDNgk7AupMIkma2IkgBTuUGaJoGA56Pr/iE6OrcqYI+ORsucugzm7R08ZkGwNdUs/ICHaKESFHcdO5C/9i0HuyNrYQv0Mhxqg5xdduTqERA90g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0553.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.34; Sun, 9 Jun 2024 09:55:03 +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.7633.021; Sun, 9 Jun 2024 09:55:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 11:54:38 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [DmbuOgwScgpmcVzt1jKQbsMQTw3yY02rcYYUHuFO0yI=] X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240609095438.3250145-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0553:EE_ X-MS-Office365-Filtering-Correlation-Id: f5c23129-9e30-47db-a3d0-08dc886a3bc2 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: 9ddE0qevlrOzgoTOep4UCylHvXdA0qtbGTzIo67HH0I6g6QJtym9hFRU7NgCXuqVI7CBuAdubSVodb0tSZMIb5shfaMNLMFZKSmYi12atByhVA0N0E//3MoEtFhCfS7OrjWwCWRonUyPYC87XN/qpfS3DGLT9SxTEE6G14C8ZH/g3kUVYQ6HhhyuvOxBbK+ppcLWN7WMmJjVWHftZYgBWtcdIgU1np7g/nhlkvd7YfG3bVYLSx0JzKNBqrI+Q2+pZqV7a8DzfnoXke8rMEksGb0i51y3gcjeXPIIFYEb477xk6v62bHKN8P47zwsYYxZnEil0ndlCMlev95sxR8G+vHovabZRvbhCf+l1GBb267UBMwg1KQ1JtQFOWIcbRLMtR5IEUF2y4NP0Niva05I9qo0gpYp5989dipo1ZA+zouBJJ2nfbkKeckpGfStNnJ8i+0v7pnZUz/GCLTJOWF8RYK5WvRrLS2bQX9JrRkF1OaH8ck+Nqllx7W10mC4EqmoVljSmaXpHDnqf3JqqLQmZT6EoAWqciq1ehNhOPrxiXcjdVmLaYlvAAnVdmKdQIZZRAViEJb6RcLktD5ObApeWHj2R0LoVrIoHDShgUQtZBTQUdz5A62s8e5I2FQ3MGV5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /wTUNvL+8wBWIVnTPkeTamzfP4i+04XbxF1SAT9CJ2X1PdB/Z97jqrcQ4c//XDfKZaBQWtVub72EhapbOMzittlmPm6GJoXgMV4iMiNkQg9jwUWRqwKp1hQiHfT97lOm2XMbrfewqoYfVQnQbPZ+JuZu5Dikbh6hjuTVGVnWUQsyKZCtPEYdc3kOrQK0czw/3QWBw666cHB1cg+/hjjQs6qd+CsEdo5rd+IqXzXtASzbT9C2XvxUFO+FLX1khZG8HOBnsNeiA1YFc3Na+8crXqvYcPqtJhTQHNOnMAJNKSTir+xidyQBVzA6mIp12b5vwXHuhFoWYTnAz4TOtZrJmFtMjCQZvr3rn+uY+Gu6TOXlVLE+gtn1lCFThlgxaoJWGBw9zdMDOH0M1RbvqGC4Z2RWXcBbfHGyUiZvumZX/ISw9eKAgioXK238KpZsAZXH7WkYPiXKq0OuAFy7udgx15AaquLdyZEQUK/QJ0vny0gey8bMH5Dfijdk7di6qgSbJfUQJ4q6xk8tBK68cPIq4EPz6hD031gxaKMMGcw34nCsktZ4AJIGnAdZZ/U3Ul4WM/THFdsy52O+kmpnFJzp603LQMnolGGE+amW+Ru6K0nQOwgen+iBrZc91ZVIUT7vMkzMNcHS6LvIzvnhYG8ArAAq6pP2m21YShYck1wLqN0ePOb4R+fs3Ft88q1S2qHyIBclp6izxKNb92p8PyBSXpqGlFt4kW8zRVrAfmrRbiqGln/2d4UmIGRwyHalYrffw+YMB4COobYrmpFylBNz8EWKzZYVi/39kJ313G+5FhO+J0Yzh/s5HQqosQNQ591moxY/jkvRDmIGfTjD89pVJuAd6b/thsDKLFYE5k4AeMsFnDH+A6MeEmGuzKvvlUiEOidJo+uO5q0Py4PBPrvVBwtDTEVKEZpPbqPcpDP3zYvyX2j8270jc0IWpjK/LJqG+J059LM/3vuQLsNQ5TzDmDBsaJviyfG5zVxoR8tR0ttG031tO75XejXyIqRJ14wJUW8kaoKd097blKGp7ZfVGQHMzI7fJEy1LAVpJFNfoOmF+MV8fMj3RIn3w+p6Obzc4Q0FZ9DjgAfCQ0gHk/ur+A2HKDJ/kMqOz+gZntmHV5tNIVi3FTE4hiHrxxW8Wo7KpQld2cS3DKV+zk6/0NtoVagkVxR10dIU3hvbtGq7ILHoQBpsdJCRBzwEuLQgD7XQXkWP4uKcVHtwvwfwnZM9OeLtTfquBgU2f0DVCkyTgnPTDk+akOmfirT3K2IfBu9gZmbGdRlgk9EWYWTa2/ap8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5c23129-9e30-47db-a3d0-08dc886a3bc2 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2024 09:55:03.2634 (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: AS1P250MB0553 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/mpegvideo_enc: Don't pretend ff_dct_encode_init() can fail 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: F6+tNVDGrobU Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 4 +--- libavcodec/mpegvideoenc.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index b7c1f08b0f..46ef693abe 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -290,7 +290,7 @@ static void mpv_encode_defaults(MpegEncContext *s) s->picture_in_gop_number = 0; } -av_cold int ff_dct_encode_init(MpegEncContext *s) +av_cold void ff_dct_encode_init(MpegEncContext *s) { s->dct_quantize = dct_quantize_c; s->denoise_dct = denoise_dct_c; @@ -303,8 +303,6 @@ av_cold int ff_dct_encode_init(MpegEncContext *s) if (s->avctx->trellis) s->dct_quantize = dct_quantize_trellis_c; - - return 0; } /* init video encoder */ diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index abbcdbc8fa..0a9e65e93a 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -145,7 +145,7 @@ int ff_mpv_reallocate_putbitbuffer(MpegEncContext *s, size_t threshold, size_t s void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix); -int ff_dct_encode_init(MpegEncContext *s); +void ff_dct_encode_init(MpegEncContext *s); void ff_mpvenc_dct_init_mips(MpegEncContext *s); void ff_dct_encode_init_x86(MpegEncContext *s);