From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6171D47A9E for ; Wed, 28 Feb 2024 19:05:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E2B368CE11; Wed, 28 Feb 2024 21:05:52 +0200 (EET) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2024.outbound.protection.outlook.com [40.92.58.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CAA868CE3D for ; Wed, 28 Feb 2024 21:05:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHLYKaqg6HRxCDwBO/D1a0vEglLkDtunBIaehaXJLBuJ3DdXZQp88S2oy8Z30s941xcXIservFksVvRcfD88hbj9TpFUyRBR7D2KvlN9JFARh8YUMd/vPkb0+g6ZdQ1BImFA9joDU1VRQnN1W6c15SAimE+2RSC+l9NKY+ejaK70umkheqsWQdOSUqwN6MzWNjQOD9Ym0yJwo45CZWHQaKVhGRCoOEUYSqfCFtncGwcVlR3x6owsuHQL8fpXMBniLteM891FLF3a9cUM3yBTOzDQNjWgyBHindJiBlN9WG3tAb/jWAmm9Doyx8TaU2f0RmVI8xnXyPfJ26DhtyzCQw== 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=vqkQfHjHc1otkm1Ll4gATvE7OKAvq48NtNQIuUq2r2Q=; b=ZU/ZDMW4n/R6gXk7UBwrR860RTkcIA5sRBCZZ8ret40ooSDLpFbcfg08oIQQJLiIl/U1qI/GLTnOX6QiZgb5UNb0VYPtVyT+CmALoKsEcjsOQu30gg5mJJGkZrVQVIoui7255s1gIjwvYAbLofspe4morpSq9d+qnPax5QOXF+NECq8oWsuJ9sE3wdNZukeivXvS3da8c4H0K5h/62NjYUH/wMHDXEHNMyHsIhfF1i4J1F+IaqbRLoTMlhG5L+GseGsDHZOpm0kh7j40p5cDPl/edP2DJssT4MC477BaMZ8gJpFq3TvKJp31JFwWo02UuMvyL4ZCUN6jKPP0hgewtw== 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=vqkQfHjHc1otkm1Ll4gATvE7OKAvq48NtNQIuUq2r2Q=; b=cQThmp/tLl1V43YWN5Cz8GbywBftt/pvv5EVCVlTg+7FGUf5ktmzFN7YCFa9h1QGLlOE3RkF30HG4om91+243tvDWWzzfPeHRaJ2u/hxwwBoXQJC92yJ7X5YpR2xd/o4evqGgvHtzbC8mQlg4DtQVkLltU93/FxND33jLpOl9PWEMnN+sCaHrnNwzIh0SR4kCi8ab7sXNxVYrAdYu0ZMtG7ZAf2G5hKgXxGuBtjggo6anCMK8LyLKQL0bJMICP/jjFwFmKo/+1MitedAZriU5X7wRSPCsgSyp+XM5RYOYSUHGfddmuwp8OERpbkGs/8mI9i52N/1zCjnNE7/6BbUSw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0563.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:298::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.39; Wed, 28 Feb 2024 19:05:40 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Wed, 28 Feb 2024 19:05:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 20:07:30 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [gc0Gwj3CnIblEkKTcjt73gAgMxJDmW2Kod82wnrdWTE=] X-ClientProxiedBy: ZR0P278CA0152.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240228190731.2210822-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0563:EE_ X-MS-Office365-Filtering-Correlation-Id: fde4ece2-9f5a-4b30-53af-08dc38904134 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8udtLrH/Tf5TwlEzRQCxK3/+hx61HvZ+dpmtp/enFvjmPuXo9CMfiViMQq7Vbm/fBIS+9SquHfjx5BDHixC7HWMnL5zSb+dltDIf6W9zgCbbZkqSJVZ7wsG+TRjV6i/XdeEhCMhsS5IqWVgoHoBAJs6OkFmJ7tW5PaMRMjAldKGfhYiuyHfpGuRg9dP/kiGtS6BeJVkzAnZ34z9DSPH2K6vF8jMAC7rM2Y4FYxqGq5snH+F79vNFvKQ2EkCgqIhuw/0cwBhEGL6VpBfOf1SB3bAPhUSP7zzY3ix4c/jeU2eOXSDlmdYJ9DatZ0gndQPWEB1pTFz0VMZ1/ptcr5sU6NCquK6ZyO56HiDncprfmCff9KEa6WPSJh4YvDbIfLrxnYzc8EJmc4jYjbV0XaPYAFi8aY3z4fher4l5YPFl5q1CuNiDXkjdaEnqUk3tk9OQ0amLX2CrLe8+j15AInx/vYig6cufYN+Kg4HffyoeB3NRnAUcIZJaSrkGhErzrW+7mrcGz7Ccjw6cxFDWd+7oylMEfOnvaD7jrK1vAadbQKlwpfDW4Kb470X40dG9P0zXNAogQKLwSGO4b7luG6XEWhX6RwUuBDRVVKCogZt+Ipw= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2jt30NXLJ4s4vRpdaTlQYzB+tq32+kEX3WW0g0wqtFZdzLUOPGYGQ/YPSSN3?= =?us-ascii?Q?KUJBKEPo2P8kfQDuQqsiK8ZivyDNzC3Ewo3lo9y9XiYBNMqjHKXrA8o8yrpm?= =?us-ascii?Q?KrBhZy3wZQl9X+JUtB9J7QoO9ddfqW80YvclLYNzPl5U46JigudIN7zvvqn3?= =?us-ascii?Q?vjz8wUAYNyocw/lTAIdlfEeBNwYf6dKdWfSdMfUo/7++Mcb+Hhwy8MVrm2Qq?= =?us-ascii?Q?oZxOO+RaeHxsciGP5DnUjpiqa+RteuXL8kQfd00/L77UcZEVeFx0zRFXFjns?= =?us-ascii?Q?z6++8EgBe2RLcK+r2XDo5C56uHOE1/JGky8zpskyzXhqUNWEDeWtZU38ALQ/?= =?us-ascii?Q?cVMumaUkeKjdtAJI8dnROsb+ALgAkxSRLwlRqDJHmUs4hWIKV54ZRfM+gxGD?= =?us-ascii?Q?c3r0wDNvVoEjkU8zsNBZDFD5DQ9KmUw6qqNB+sVFh1+C/IQDU99WFwwQuPpz?= =?us-ascii?Q?mGVC6l4afHlerrhuH8YnE+djN4IIqR0a+0A7owwKKq1FHsONVF+TF4VoGZK1?= =?us-ascii?Q?yapgfKN+M7E6G2UZwmHl6tLoSmsE49SdnJle31EvW7m9DSNOurBzYNZ0GTuT?= =?us-ascii?Q?Mwz9VAbpSBf2qKzJLGhOtOAlXD/o7KCt9ziNd811mkrDs0nnWHWsj17DZugK?= =?us-ascii?Q?3yKLDjB5pvMa6KTDgqaCVvZh9QxJR1AsgGG2IGdHoMavT4GHOBrnfwV8Vlpl?= =?us-ascii?Q?pgQHETF2Z+DqEZ6ofmmFhhup8wasljjve24g4xuVOy0bZJRFSQyyLtwoTfG7?= =?us-ascii?Q?+QjewXsaethnd55KEe5LtOmKWT5B7E93vv2R19Fjw8dta7gngdvhjdW53+K7?= =?us-ascii?Q?Tk3Lq6LLrQ3ROixutDd4rlp+kQ6gkCrAgEqJb9mZ6NC5E8R0ovo2FctfhUqm?= =?us-ascii?Q?eqgBUeJdQ0QAt2hDgk6VDmUOWEn+V+N2wVwtnwy8c4hv3SJwXHlflphcZTGw?= =?us-ascii?Q?86SWgt9+Oc1KbFzsurx3f+Fjhak79Bv7isqZme9sYqqEgxCSYJYfVwRkpkZV?= =?us-ascii?Q?8tW3EsZ2dNUBMAgZ2g3garjyQf7nLFTDauZXTGCA/2pA5HIVYlp+kNVAOXc1?= =?us-ascii?Q?TDcTGefyJuImy5M/Nndq43GCo8WK+18JZeeSzV7QIuUAWJHrndsX8JTWip3S?= =?us-ascii?Q?evee03pxMS4n6VTbnVnFPwaQhJU8cEeKyn18IvvFHzHzedVACJz1GLPGghus?= =?us-ascii?Q?lHmfuJZs+u+JW26NvCm5zoN+pi4BLETqBXEhTe9qt3B3WMRF+qNna/2u8BYM?= =?us-ascii?Q?VkznGmJ7X+A2djAhA4s6WdwbPtgUia68bda2oJyeBw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fde4ece2-9f5a-4b30-53af-08dc38904134 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 19:05:40.1895 (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: PRAP250MB0563 Subject: [FFmpeg-devel] [PATCH 3/4] swresample/swresample: Constify swr_convert() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 3 +++ libswresample/swresample.c | 7 ++++--- libswresample/swresample.h | 4 ++-- libswresample/version.h | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 2fca5b7ea8..7d34d12c62 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2024-02-28 - xxxxxxxxxx - swr 4.14.100 - swresample.h + swr_convert() now accepts arrays of const pointers (to input and output). + 2024-02-28 - xxxxxxxxxx - lavu 58.xx.100 - timestamp.h av_ts_make_time_string() now accepts a pointer to const AVRational. diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 1cf83a803f..6948892d76 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -563,7 +563,8 @@ static void copy(AudioData *out, AudioData *in, memcpy(out->ch[0], in->ch[0], count*out->ch_count*out->bps); } -static void fill_audiodata(AudioData *out, uint8_t *in_arg [SWR_CH_MAX]){ +static void fill_audiodata(AudioData *out, uint8_t *const in_arg [SWR_CH_MAX]) +{ int i; if(!in_arg){ memset(out->ch, 0, sizeof(out->ch)); @@ -835,8 +836,8 @@ int swr_is_initialized(struct SwrContext *s) { } int attribute_align_arg swr_convert(struct SwrContext *s, - uint8_t **out_arg, int out_count, - const uint8_t **in_arg, int in_count) + uint8_t * const *out_arg, int out_count, + const uint8_t * const *in_arg, int in_count) { AudioData * in= &s->in; AudioData *out= &s->out; diff --git a/libswresample/swresample.h b/libswresample/swresample.h index d4dcaebdcf..78495a0d4c 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -340,8 +340,8 @@ void swr_close(struct SwrContext *s); * * @return number of samples output per channel, negative value on error */ -int swr_convert(struct SwrContext *s, uint8_t **out, int out_count, - const uint8_t **in , int in_count); +int swr_convert(struct SwrContext *s, uint8_t * const *out, int out_count, + const uint8_t * const *in , int in_count); /** * Convert the next timestamp from input to output diff --git a/libswresample/version.h b/libswresample/version.h index 46a4e2fc62..dfaf6f8c42 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -30,7 +30,7 @@ #include "version_major.h" -#define LIBSWRESAMPLE_VERSION_MINOR 13 +#define LIBSWRESAMPLE_VERSION_MINOR 14 #define LIBSWRESAMPLE_VERSION_MICRO 100 #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ -- 2.40.1 _______________________________________________ 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".