From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id DAD2844990
for <ffmpegdev@gitmailbox.com>; Wed, 4 Jan 2023 17:02:14 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D28C68BCD2;
Wed, 4 Jan 2023 19:02:11 +0200 (EET)
Received: from EUR04-VI1-obe.outbound.protection.outlook.com
(mail-vi1eur04olkn2035.outbound.protection.outlook.com [40.92.75.35])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA55768BBEB
for <ffmpeg-devel@ffmpeg.org>; Wed, 4 Jan 2023 19:02:04 +0200 (EET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=J9Ltsi2UAVVvAnCbUuQ09Jk4z/QWTPv16u/MgllxgFFZTl4AzaMjxAqL8tBYmBEyPP/eBZCaFcmRyjn3nDNz5u2uY1nWIeKTbITg4N06tBuqtbzRx2rAAvW/mw+nsb1f8k8wvPmJHqdmXm2C+hS3p61/Q8CZNBzsh3bUj0jdaB2rB6yR4V4OxKBpp/CD6uoW5jaX6q4J7L7xcHM1nshlM+mbYeiV994pWcqnnYgB5Th67PkYp0ucAqLhwDo9uIl/FQEFFp6fPellqVkx1kgvZ/zuQojT30qHabTw7KMVxkqRUHUKPbyu/Y8AyoeLtARkkqc0U+9kT1T7zeOPgJcIMA==
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=2OznLjd8ZDwdTqEaMft8VCgFBxzZDCpaeOq4DmpGSeI=;
b=M+tmJwNnR1skjRadj5vUAQGhU7HciCoK8Gq8VpVtdCr2M2bIXU3qfJxlvwy8HEAld5OX7UHUGnN4xTUQAdAxvLmYUCPZv3zTL94At8ETvlHUl0img+89ZPJWJ4cXznZCFu6czU0ebHW73jBR9v2qcwsCCXIQoiRHJmtevnkG11aiEXkLxVnjIjF8ZZP4iOovYb2QJv3wmIIHte/2mFMDlzPpa2QkKrZJgdc919EPW1kVVAuWPnQgMU6kDC+y09ZkrE3zHPWYLFZT01WYwG0luQbEZrbaXwszFbhlmC6nhFW0rnIVB18lHd7M59ni8qzM+4Or4i8R2BrtodhTtStvCQ==
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=2OznLjd8ZDwdTqEaMft8VCgFBxzZDCpaeOq4DmpGSeI=;
b=Ge2Nw//3RtGcnepmFNLsvdUBsUFwEnMW+t6yNZ9MZsMeuthCJNigu3kCn1nGPqsHvdDKlkMvNOnZke3HGS37E+WdFXh1kJoBMlXunlW8lhYE+bNWK75cS/dYAQ9WUfpnNZF8fNK/vWmOSOfdDjsQz9Ie+BU9bbh5vVZD3/SaHG2tg6acVR32ZF7MtLt9F5zB1aYwVk2buqwkwNwOTKOieVHzMG0j0yDPbo9KTN0oBqUelBA72kNunEF6Zc3aMrSEdXsQ2xxXBN9tm/J8n1m/L/PTwM8Vy82Z+p717s+h57ln1yX5sVK0DnPPRwQUMGICUcvJQnkK4A36nRaCFNfF4A==
Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14)
by AS8P250MB0814.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:570::20)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Wed, 4 Jan
2023 17:02:03 +0000
Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
([fe80::c37:cabe:316a:60b2]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
([fe80::c37:cabe:316a:60b2%6]) with mapi id 15.20.5944.019; Wed, 4 Jan 2023
17:02:03 +0000
Message-ID: <AS8P250MB07440804240A2A94F96EAFBF8FF59@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Date: Wed, 4 Jan 2023 18:02:31 +0100
Content-Language: en-US
To: ffmpeg-devel@ffmpeg.org
References: <CAPYw7P72E=6rM5W3Modq2qD+-SpcaFDE+N1Yec4jd6=zZZRpeA@mail.gmail.com>
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
In-Reply-To: <CAPYw7P72E=6rM5W3Modq2qD+-SpcaFDE+N1Yec4jd6=zZZRpeA@mail.gmail.com>
X-TMN: [XJ8iKgDgznUS6J1dN3n5hyNlO2VUH+Xq]
X-ClientProxiedBy: ZR0P278CA0032.CHEP278.PROD.OUTLOOK.COM
(2603:10a6:910:1c::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
(2603:10a6:20b:541::14)
X-Microsoft-Original-Message-ID: <cd1c5726-7cc3-81e8-a264-c540ca157497@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0814:EE_
X-MS-Office365-Filtering-Correlation-Id: 1b6fc59e-b795-49e5-7ae9-08daee756709
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 3bEn9dug1YX0i3FrGXauEhSdWA0P49xqgzK8FLlRBBephO4KMYh/Ut/peoOqSbTMDfbiCZc9ZEVkp8ORPkrTUSBmbAMd6X/mLucNi6/0ZGXpDAk4dcX1fenr/iRIPil9fCGXuvi2KVMQGEE/2BSjDTWPtWANAHZ51brwMK/oK4lhG8gq30I/GO9kXYZMs03miFEa72ioKRnlXXLvBv2yfyAoCJi3n1SgTTcm90imMU88KOscQa1YmI10Ncn9K5eEgfZkkgL2ZSCN/plszLklq2170RuRuZt0jc16u17qdJSMo60muhtbV9ENvzcKNp8SnT5u6cyePniMfW+r3lU/8RCiXLy1PBTX9R/QMK5hkZkv4qtLYLcwA9SNJiGdM/xxrFG5uPQ2qCT4xX3gdjeJji0NE85plyC7sgWM2QpCDXFBnRXa8/wh/4+kFv5fsIkyc1JnS68OIEyQBfBPfpX8C+4Bnayr+18RpIFg5KEaUGHgB9MCHcyIU3hSRFTIcYw0vlVo8nXHhQrFgcRM3L1NSe8WhofrnEEbVwfKBWuEcAPEf6Prq2SKcNvpK0kMsJS6DGjm0wHHbfmyDSB2a9J07CMzxtwaeOLiF22im2KXDOWWU8W7d/S7qRcGJqaEfmgKViK0NmBlhdn7pU5nyUoojm32kNJUWh5g3tcA2ayf3ME=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TkFjckZEWi81Q1BXVXdwdW43VmZGVldPZDMvTWhtL0IxamdZVnpCcEdTMWpv?=
=?utf-8?B?RjRidE0rbW4wYTZoS1QvZXpsZ3U2SGtCQ2lmTHMyLzVlZ0x1VkFHUHJsMHBE?=
=?utf-8?B?NEJoOGhFL28wVTB2blZiUTQ0dHNsaUZuMDFjT1ZBeUI3NmlZeEJJYzJHeHEx?=
=?utf-8?B?T2ptWFBicTJKWTZBakxaaXFFUVpjMmxZVlVtWmh2dXVTNFVHSmo2OG9iZ0V5?=
=?utf-8?B?WW01dVJTeEVVbkhGcVRMN1kwY0FNL21EcVMxbnhwS1pSWThnbVRsOGs2NUZB?=
=?utf-8?B?dUplblpMRHE1ek83UGFvOGZweTBJYUhLdVhVeStkSnNINDJYMGxtUGpCdmZJ?=
=?utf-8?B?RkxuRXpwMlY2bkFhbkU4M1ROWFE2cm5mWkNIVmg2VklyMGR2MEF6NW9YQ0hR?=
=?utf-8?B?Rnh2S3BNUXE0UnFmamJlMndadFNjcUFuQzN3cTBwQ0l4R1RlOU1ZN2ZqTHpj?=
=?utf-8?B?bjBneXZQV0JrVW16bVBhNVYyc0tKcEg3c0sveW0zYXgwWGY3UEIrajJzRHM4?=
=?utf-8?B?dlpVbys3NmVFVElsTXB2ZFdaenp4WlkvS3ZMeVArcHB5QWdQQVJLSjY1RjZ2?=
=?utf-8?B?MUFQVGhGUjFjaExxWFlOSHlNbUxzeDhxclBlWkdQaFZLUi9BVEt2QlNjWVZU?=
=?utf-8?B?QW1TNVZrRmdZZzlNSkc1TkdENVBFSFpRV3c2Q2VNa0R2Ti9Kd1g1Z1d2eXY1?=
=?utf-8?B?QWZxZTRlMFpYajhHMzdpRVdsdFhrcHVvaitTSVRhZ2Z5R2ZpMGl3ZElDczVl?=
=?utf-8?B?Ty9CNkVCSmtwTUdUUk1qWFozNkt2bnZlK1ZOVnlHUjhIUHZDc0lLa1BiTkFh?=
=?utf-8?B?ZDJVMmhES1I3WXZ5d1VUM1R2R0VIcGFWRE5QZ0l1Vm9MdDBqSFlrRS9MVnU1?=
=?utf-8?B?TkRteEVqZ21zTFl1ZjZMa1NmYUFiQ0R2aEFOeHBWdW9VdFcwb2xXVWhrUHJl?=
=?utf-8?B?QzZMOFNyRENsakwzTk56dnU4Z3gyTEVoM1hQeXJyV1N2TUpSa0dSdjM3c2Fi?=
=?utf-8?B?Uk1MTTliam1MUUtEQnFGQ0RteUhkSHphM0VYUDFoMEREdzQwd0pnazNNZjY2?=
=?utf-8?B?SVduZXljZEl4RlVYc0RVRzZXSUQxSjhHYmlUVitIdm03VjZ4TGdGVkd6UmUy?=
=?utf-8?B?SWNBSVYxRkgxSk1TZkk1UkRGZzZCTC9CS1laWWFra1cwVlZGK1JBQjVXL2Rr?=
=?utf-8?B?cVlxYWN4UHBIc2ZZSFhkQ1dFQWVPRy9UeXFlWHI3NER5N0dJaGk3V3EvMm0y?=
=?utf-8?B?UXkvWkx5LzhtdHhyVi9ic0xTNHJZQTJydWZYcVV0TXRNUmZiQjJVaTVoOG5D?=
=?utf-8?B?bDRkRUVkc09ocFRmaS9jVC9pbG9EWjhKdHpadFFPQk5ZNmU0L1NscE4vWXVn?=
=?utf-8?B?V2JtcnZMT0xvUk1kZlIxUXlZeVVSYVJrSDAxUmR4QllwazdwbTJ5d0VlS3lu?=
=?utf-8?B?czlYYy9BOEdQdkg1aVFPMkh5eGw4eDdRa28yNjBCQmRONUphVXRKQ2N1bndx?=
=?utf-8?B?cmh1d3U3VlBoREJEa3Q3YktpUWoyZERGdkhsRjE0NXE4aVcyZ1pSc2hQQlV6?=
=?utf-8?B?MVRDOGZlMkVmMnhhTDlBUFhLdFhmK1k3bDFBa2treUl5eUdnZHc2UklOL1di?=
=?utf-8?B?WVBtVHh6Ri9PaTlYbjIvUU1IZmhSb3NZT3hZYXNQR21Bc2xQSmlmVW1HaVF5?=
=?utf-8?B?M2J4b1ljSHBlalhvc0lUT1p4R042Z1NMWWc4aFVoOXNlWHl1VlhNMXhGRnN4?=
=?utf-8?Q?wMw5xqvXUcrT0FksgI=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1b6fc59e-b795-49e5-7ae9-08daee756709
X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 17:02:03.5792 (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: AS8P250MB0814
Subject: Re: [FFmpeg-devel] [PATCH] swresample fixes
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>
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>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/AS8P250MB07440804240A2A94F96EAFBF8FF59@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Paul B Mahol:
> diff --git a/libswresample/swresample_frame.c b/libswresample/swresample_frame.c
> index 53ac487136..319ce045a1 100644
> --- a/libswresample/swresample_frame.c
> +++ b/libswresample/swresample_frame.c
> @@ -84,7 +84,7 @@ static int config_changed(SwrContext *s,
> const AVFrame *out, const AVFrame *in)
> {
> AVChannelLayout ch_layout = { 0 };
> - int ret = 0;
> + int ret = 0, iret;
>
> if (in) {
> #if FF_API_OLD_CHANNEL_LAYOUT
> @@ -96,8 +96,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
> FF_ENABLE_DEPRECATION_WARNINGS
> } else
> #endif
> - if ((ret = av_channel_layout_copy(&ch_layout, &in->ch_layout)) < 0)
> - return ret;
> + if ((iret = av_channel_layout_copy(&ch_layout, &in->ch_layout)) < 0)
> + return iret;
> if (av_channel_layout_compare(&s->in_ch_layout, &ch_layout) ||
> s->in_sample_rate != in->sample_rate ||
> s->in_sample_fmt != in->format) {
> @@ -116,8 +116,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
> FF_ENABLE_DEPRECATION_WARNINGS
> } else
> #endif
> - if ((ret = av_channel_layout_copy(&ch_layout, &out->ch_layout)) < 0)
> - return ret;
> + if ((iret = av_channel_layout_copy(&ch_layout, &out->ch_layout)) < 0)
> + return iret;
> if (av_channel_layout_compare(&s->out_ch_layout, &ch_layout) ||
> s->out_sample_rate != out->sample_rate ||
> s->out_sample_fmt != out->format) {
Using err instead of iret seems better.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".