From patchwork Fri May 7 06:46:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273292iof; Thu, 6 May 2021 23:47:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnZ5pU30PovrHQRjQGoj446yU8ONbgrVarDS3FvYajI7YMyfKP8AB8CZ88kMra348hZKhf X-Received: by 2002:a05:6402:451:: with SMTP id p17mr9641943edw.223.1620370045189; Thu, 06 May 2021 23:47:25 -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 ds10si5359013ejc.709.2021.05.06.23.47.24; Thu, 06 May 2021 23:47:25 -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=LDEJLzRK; 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 A75766808AA; Fri, 7 May 2021 09:47:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069107.outbound.protection.outlook.com [40.92.69.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D1DB680563 for ; Fri, 7 May 2021 09:47:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=miBh8oMkpC6vMBJZuVddZxZcOEG2wtbxHU4orCXL0nHVOvmF3aDInNGFn7FXoHuxkH5YopSt6ghFNRTr1ciaMStrXbczZNFmZKqKagniDpo8ckeWmP/FgFT328j2ude/mKQwhSQeb4WtF7qBSEB59Tx75B5iO3jhX4y4z9VACEMG3dnDvZ2qTjXYkf0xsm693wR6G32+WmOGjqyq/j89ZVWn2VM3jeStlunqRbjsRnL7w7/Z7eCVIZ0fgJe6sleUdIXdji0106QeZeWf4Z+6fCvjdCJEJG1IbV9TBWCJQIztUyj3rV5ToVq0lD5tKlV7kbplNB8ujG475ILeUcmJsw== 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=BcaYjCLX0Ai1+1juPklM2QmhiK0QiWF49kL8xfELozA=; b=gBL3VKsMkJBbqhwUwuLFllpM3Krf7WJ4J3GC/ZNi1O0YfnTZ1ZlIdE3KxqJeokORjmh68GM+BdzW+2DvGQOGX0lwgwMKvY0JHupvP5qIZ7C25bTK94tnoKp9dz1sbrnuiHZoUP23uEk6N7ve9AYHpadzT3x6Ba84fAIFgQmTRdAUxQcxOUztpRvgDNp7lfhBPNNFgtvZ4JOQMfD0MvQDZKqg4OWj1DBgN+Ra0L8GAu2qVOxcL7IL2VWwjapgkPuE3CxuPSQFe4XEMRrR9fS51HRBsq/jLDM7N0gT9Q5711MTnZpATTl+Cm9ZIh7F9XL4TFXn9gmTrd1XmWYrE5Iszg== 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=BcaYjCLX0Ai1+1juPklM2QmhiK0QiWF49kL8xfELozA=; b=LDEJLzRKLYmdUhMgGfzv5EuWj8hyyQF2FIuefY8L5hHCAMGovyAk8w0JX8uRzNcF5m3fcenvBgCBhUBfCuMbnRvAlAQ4DduQi0ddmhdirc8PFuFHsZk7osrTofEhXnJr3vIKuHkSC/W9PYWJQ4+Eaa9pceUvsOSqfinqorFI7gIEhsIHrLpIr7HqhzPQRBN+BzuyVHc3nd4f6PgMU01qnvXRWBNgCrfFHdaoR6ywYodxl/yb2WH7dV+2nfNS2maC3HoBvYr37eZETpmOiVzPSKZ+SBCAEAVtg88GIKJuXqfqz8KtIjVz+j25uyUIFbyTHGyLApTo809UeBYUzQfwsw== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02HT151.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::382) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:06 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:06 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C8884E293383C3B08C9448977CC941FEF049CFFF4ED83190BD959A1A87B56F46; UpperCasedChecksum:167C270CC34A17056BC330E471AB00FBA7222615DA87B613B094AAC8EFA5DA60; SizeAsReceived:7605; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:31 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [m+R+5IqHBd6PYEENeBzEf1jdBL6Ej6tYOB5ywNSr4Xo=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:05 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c07a3ebe-3d51-4390-46c1-08d91123edb3 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8k436AIPM2iNNzGuhM1MMnvCwAwfeCVtNEXIY/WAuKDhcTqEYoqPdtFOa71bYnzHXLy/TLfBkNouR68DtBtGlHQU+puc6IjtXJs/LJ/kGX1YmRA0Hmy4svHdmzy8zQN4/syDQ3x7o3C5dY+vobGOzCCecE91EqWOSeHqB7ENOZz1vTicFQvQO2YWc/NY9ac7R+buaUQChF6nRonfLq4ByqWSEo3lBHIdSrQOBBUY6AyRX8zeDR1ZKPFXaNJa1mJ8SKBEoHg9q2fBDJRtYd0qAmGqa3UeJqIzf2FnxREJj0w7TXwuFnVQz9OLGaqOXK1Ic/Qaxv7O3uX7xnBRmgl6H3ao3v9THmwaZRY0yzbm3dHKi7OqGLIg+T0p398SI+9lX+CbD1txMZIA3Ir4qbsTa8/b7hVg9OCvVKYY+zRrZLRLEdOtsmB3uadMZgVZo1i0lgRvqxZs5dOkzF5uDa/UdHQ2arxL23UID0CMXQngj4UZL32lFwd61jKupyVjtQVWwRIL7R/wprjNwqZuX/A0Pje3vsxw9q5XOZa5hWBuVMIW2DIQfaIVAlYbsHWzTFXCogrK7gA8u5Sfku80iTcMSXkxm9dDCc/JPLbraHv5ahpfjw0EbWzYpR1Io7MKTPPG+sPDOknJmWwHmUdVo7Dcv6HVcNDX5WNdt/iMuNjPjbsAQ== X-MS-TrafficTypeDiagnostic: HE1EUR02HT151: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0fdZmhxXZTJrEUfK4dVga0kq+HBGDA7h5T+8wmvDn8pa+x84ZJX863gMeP28goVVH8o37/hG4erS9AIx00EtJCPbDUnqrs8hXGnVebS1q1bGDQROrjWw9H2zjvWLh35amsr1uVNzwASlUpEhktNxwCbXnF3CANcT1p752Fa3uF1QHxADVqXbyzjo1aZCX3ppIA19ImGR3xcA15A5Ymv7DE2VrM93O48CcskLWPkZlv0zlrt3fZI84wquIxyKtFfogEBuCqH9cYc0rED/3BpwUM+odckmBod7uJxz9dD8Oo/78OkqWnGGF8RY89yQZcYnSnGzY5j8hWCIzIqX66t7QjJUIMSyk2rvqDLWQBZYjsSfW5R1z4Wp+yGhg0iUsriqYbnkRzG+ptuOnpj4Uoalug== X-MS-Exchange-AntiSpam-MessageData: fjZe4HuCxuPIISdx4U8Dql4piyNDg9e5HH7hfsmE7TF1KKTsXewQpO32jdJf6KbxHs2iJakhc2pvJjfxhD9otnyO6XAPjQYNHI8I7m5lFjXQKNUyLLRe7IG/ifjgyGoBlm3Qxg/FJt3/UCAaYoacWQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c07a3ebe-3d51-4390-46c1-08d91123edb3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:06.1911 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.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: HE1EUR02HT151 Subject: [FFmpeg-devel] [PATCH 04/20] avcodec/wmadec: Forward error instead of return -1 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: bEF06LnoAKOF Signed-off-by: Andreas Rheinhardt --- libavcodec/wmadec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index b63ce66b23..6eec85e59a 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -70,7 +70,7 @@ static void dump_floats(WMACodecContext *s, const char *name, static av_cold int wma_decode_init(AVCodecContext *avctx) { WMACodecContext *s = avctx->priv_data; - int i, flags2; + int i, flags2, ret; uint8_t *extradata; if (!avctx->block_align) { @@ -102,8 +102,8 @@ static av_cold int wma_decode_init(AVCodecContext *avctx) for (i=0; imax_exponent[i] = 1.0; - if (ff_wma_init(avctx, flags2) < 0) - return -1; + if ((ret = ff_wma_init(avctx, flags2)) < 0) + return ret; /* init MDCT */ for (i = 0; i < s->nb_block_sizes; i++)