From patchwork Thu Apr 8 19:42:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26814 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D9F2E44BA1D for ; Thu, 8 Apr 2021 22:42:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE14068A628; Thu, 8 Apr 2021 22:42:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2048.outbound.protection.outlook.com [40.92.17.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 326DA68A3AF for ; Thu, 8 Apr 2021 22:42:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WNY1IrX90O2hnSYQXKyYtJV1SCbYFLmL3dOgR80TVHLkXaTRKDU6KSOXf1tkcDPLTlc6BPp1oJzK4tosgMhFHrW8PPOO2JLkQziD37b1SQEX4L0+TvpXY7C3ZCN+vR6C/1wWKAgh6mOaPuBry2EPZtdPyD5ScQ7/mDGZqKSPpgO0c8vo/FzL6B2bES5oYlzR2hY5lZlReuLBN0xv+yNLh36IB9aT1gQO9KAakL442ewrneOUMV8uGG4U71BHWEkmOKqpZzTR2jmLCGTXOVR3nYFeUqOGWuEGV6fqqC7N8XmzfB918VKlIpPoEaF7Su/CIJWW9ahBkgM+BcKJwX8i8Q== 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-SenderADCheck; bh=QL70hRkXln+JQVirOfh8xpDiAGO8PH3zJO4gO78UeP0=; b=AXnGbXVAseS3pILq3DTpEzQeurcg21tPZ60eAtC4jQuyP0zcrv/jPKH8vPFxDcAP/r1SQBo9Zr7PSR3/a3Deb8G4TwDvAD+s5P/l7Vsk+axPbJ8VWJrpXCC5sOr0oWDbDE9lBdBjEL/MOCHKnxzYVqSGKbj18imq0xEkM0wmEbkaDRlkE7mueysGhx49shX31NBi1wsASKTDSzafymS9VquAy0Nm4Uh8fyoyUgi9jHymgZ9MntRvV5GOa+dYLXOdu43akkCVcAIFJcxrgCp6scu+7VQTCAxz39BarZEeQ6EcBWB/N52AJpFor01uRMSTTku5f3GEEyvDLfRkqIg7xQ== 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=QL70hRkXln+JQVirOfh8xpDiAGO8PH3zJO4gO78UeP0=; b=Zsm5l9RKt8ycooDXyTSN0sRR/a5xGjpjMMDoYzTJniBBmbreH+yeixaUuytaKXEPTfIPxoQB4ilcmhsSzI+3CAcB2xhYe7osrbyGfUYSphtAlNR5qRRqKJyfJrNgBhyl3RrIW6KQhpY7HQSEKiOJ3E8YYzq/g2sDqiEw+rzO9IaCPQvpw4K6eA4sgR9bMcoCcjJDWBYd7yd83FgESsk5iivbc8TvWoBDChW56dFiiSmAL3vHPKpXTp6mrQvRLdBDp5FqFk4/Uj/xu5SgowlUZZGEJ7JpMHzsmq95Lk9XyciJsv2OcAxuTpu4SOdswKP0p9sic9yxxieNf68CVNZi1A== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::43) by DB8EUR06HT120.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::496) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Thu, 8 Apr 2021 19:42:50 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::41) by DB8EUR06FT049.mail.protection.outlook.com (2a01:111:e400:fc35::84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Thu, 8 Apr 2021 19:42:50 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:22740ED05E214A21A9A2DDA281D5344B4BD2862AFC7CF8FE334A458DAA481B39; UpperCasedChecksum:1D507A5F4E5C98D2AF366DC5F33C549654F5C0A0A6E9D7BAAEE84649FE34507A; SizeAsReceived:7596; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.4020.018; Thu, 8 Apr 2021 19:42:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:42:17 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Wx7HS2tI+j0y7Uy9XI0RiBXomDlc4pv8] X-ClientProxiedBy: AM0PR05CA0084.eurprd05.prod.outlook.com (2603:10a6:208:136::24) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210408194220.1242703-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR05CA0084.eurprd05.prod.outlook.com (2603:10a6:208:136::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Thu, 8 Apr 2021 19:42:41 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 050f9870-6850-4e7d-9ef7-08d8fac6796f X-MS-TrafficTypeDiagnostic: DB8EUR06HT120: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mEvZlEyemUuzpidE5l2qRioB5hS7h0p/t2rn0nvW5NVBkbxTjedAtC7Gv10t5YCj3dfgzCOYAKPVi/YVdXa+aUtM2ppzeKQKS3UH4fCMimmMbUQq9L5W6R/6jzbTvhdRWyuk4kv8KGYKVZlKXa7VidnniypcaOvsiMaeXdugcBxSFC4oAPPzDjg0RpBsVslD3vRhlGBDnzUuJq8CAAiK4lOo5XXRg+vYXySSd2Otd6E7nRhcZblLkLw5FTlY+M/8Cl80gyyCkbqjArJkUtfZVR0kFHd57+GSsYn0I7anKfxXqYbae86zxwTam2gD2L2oFwHQCRWLKWwsLXT7QWQ5XYdqjAuRbeSEBbDx1UE6T+3ZDJQ0MsqGEexWqfYeBSxT5GR5K5Vi23/hYxvab5FOgA== X-MS-Exchange-AntiSpam-MessageData: 7w2OXl/3Da0NQdpc2XtXj/VUVm8TZBNBxL1WWgWXWzDwOpPhU8rbjLvDS8zaK+FpMhrlovVhtJ7QciToyuBiYdViiX/sfXWeSAqRZsu4NLrFlwBvCOrWemgtMUR6176I9alQHSoXb5ooQBBzLpLcrg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 050f9870-6850-4e7d-9ef7-08d8fac6796f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:42:42.2271 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT049.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT120 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/vc1: Don't pretend ff_vc1_init_common() can fail X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/mss2.c | 3 +-- libavcodec/vc1.c | 4 +--- libavcodec/vc1.h | 2 +- libavcodec/vc1_parser.c | 3 ++- libavcodec/vc1dec.c | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 9434a740a7..3e3205ae92 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -751,8 +751,7 @@ static av_cold int wmv9_init(AVCodecContext *avctx) v->s.avctx = avctx; - if ((ret = ff_vc1_init_common(v)) < 0) - return ret; + ff_vc1_init_common(v); ff_vc1dsp_init(&v->vc1dsp); v->profile = PROFILE_MAIN; diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index cd9975d8cf..5d854b35d2 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1695,7 +1695,7 @@ static av_cold void vc1_init_static(void) * @param v The VC1Context to initialize * @return Status */ -av_cold int ff_vc1_init_common(VC1Context *v) +av_cold void ff_vc1_init_common(VC1Context *v) { static AVOnce init_static_once = AV_ONCE_INIT; @@ -1709,6 +1709,4 @@ av_cold int ff_vc1_init_common(VC1Context *v) /* VLC tables */ ff_thread_once(&init_static_once, vc1_init_static); - - return 0; } diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 4559a06cb6..3e5368b891 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -413,7 +413,7 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex int ff_vc1_parse_frame_header (VC1Context *v, GetBitContext *gb); int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext *gb); -int ff_vc1_init_common(VC1Context *v); +void ff_vc1_init_common(VC1Context *v); int ff_vc1_decode_init_alloc_tables(VC1Context *v); void ff_vc1_init_transposed_scantables(VC1Context *v); diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 493ffde611..1a9d3c0140 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -283,7 +283,8 @@ static av_cold int vc1_parse_init(AVCodecParserContext *s) vpc->bytes_to_skip = 0; vpc->unesc_index = 0; vpc->search_state = NO_MATCH; - return ff_vc1_init_common(&vpc->v); + ff_vc1_init_common(&vpc->v); + return 0; } AVCodecParser ff_vc1_parser = { diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index ea93e11588..a08f7fe847 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -434,8 +434,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; v->s.avctx = avctx; - if ((ret = ff_vc1_init_common(v)) < 0) - return ret; + ff_vc1_init_common(v); if (avctx->codec_id == AV_CODEC_ID_WMV3 || avctx->codec_id == AV_CODEC_ID_WMV3IMAGE) { int count = 0;