From patchwork Fri Aug 5 21:00:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 37155 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp735405pzg; Sat, 6 Aug 2022 04:32:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR6sNuxZWIpiEYrXXTkuMdXdeGGC6yBz8ffaXLw+DBZP5zrEChKJ5T6vcoNSk85L0pcnMOjM X-Received: by 2002:a17:906:8445:b0:730:ba5a:ef59 with SMTP id e5-20020a170906844500b00730ba5aef59mr8594281ejy.182.1659785557814; Sat, 06 Aug 2022 04:32:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659785557; cv=none; d=google.com; s=arc-20160816; b=snmzjv+C4TO2/+atxUTbcAOO4xpp9R+a5hV29H9AFVbBa7MvDQ1FRFFieO0jM/DP4p OgzIr2PWCAL8VujR94NB5wsIfHSFQ5L9DS6y4OOiu/ZwOEf3fHSYCz5ndRQLdsY3QY6j pxzll05NXGsaQ2TapmpndEVPgHwivXA6LNYvlFEow5cBrPl6TvtNVirFfTT7/rRNlcde /0gGrSC59gUoHvn4uoMD++0AtRguSflFurE56JXDQkLF/l+6s8GL1pbgCHMQz8wnFwoR Zukdd9eN4T1RhIFz1jg0kE1BLI4FS+RV3btjrWPwzmZxUFRb5Dvc1rKXSd6XJtYghNsq LZUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=VvBd1FR0L7NptWN3OhZwcOCldKoLe2sGBVZZ3PQqNrI=; b=D8Arb+wT5OyfUvjnOzZgEbeYV/0dbEhMv4U45TbP270XcHr2HHlthfrK29nDIxew+h zTeTXIEZIVvf9NLs9+D/6zM/3ExCBnhvvW1OBuz2F/cY7pGYRAbSDG1LuIC8AfeRSh64 CVkKtOS43+rhfWXOfDHfaxx9YZ7/bwo5U7WbwPVux6gsESmmoen2MCCXmUeUKWXsdEQc cb73hEPk3GeVMY1SLYJag3zQwct7Si+T/XbNMzyqTjMKL1uNRU4L/gnun0P2L0k0DJQ9 JsIBQ9VeIyrU3qodxijQmz5ICE+EuRBkj+z4Zh75Rnk8BauT31NgykmzLHC6dKvk3Tw1 wprQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=H2JjMyCO; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d17-20020a1709061f5100b0072a605a57e9si5657938ejk.329.2022.08.06.04.32.36; Sat, 06 Aug 2022 04:32:37 -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=@rcombs.me header.s=google header.b=H2JjMyCO; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32FAA68B6F5; Sat, 6 Aug 2022 14:32:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D47E068B685 for ; Sat, 6 Aug 2022 14:32:26 +0300 (EEST) Received: by mail-qk1-f170.google.com with SMTP id i24so3507865qkg.13 for ; Sat, 06 Aug 2022 04:32:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=xcm31F5PLBf5oQ6iFO0CZhKHqc8w/++TlGBbbgC7l6c=; b=H2JjMyCOdUq1As8CslIuyucVC0m1ualOppln4Dj8FNlxZUFr6Kg1a0qhEkggWPO0wq yzxbzK33PlnprYODtrbsmmqRz6xsflR/P0T1cjeiQ4AM3uG/I6zlL3SX+q7kY0EqDfIr SgRcEyjpYxXjm/pFmHOUACGdt6vj1Gp/Tf96Lwb3vYWQiEVcNQeBxzZ+ZoVnXb2FGzzX qr09b0dwuzfSNTFAhZEQ/VtqaW0+N83I4DS92HGLrrZZQzzgZ2HHWgNK3EQGEUav1Q0Z gQWa1xuP3BaOwp81PNdWlFrsx5gIep5kxP1Z0eIlvVafVMlNjx7ar26hD7oFWQoA/RwL 4rAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=xcm31F5PLBf5oQ6iFO0CZhKHqc8w/++TlGBbbgC7l6c=; b=ycELrMEBVVM+Fx017vgKSDeaqe4IJ0nphecfiO5d38ZE41UVrzDvVH5O3czTRfTpDj npMEagKkqJsVXFakdri4ujCcD1e2hCb2ryzT50u+Ji7bOkJ1MR3ldLcPmq70DjsB9IMX rSaxzwjrbYutGMiygCSeILtkbUVG7xm0d2xASPbmxIy03TQhCXpSEKK4qkaT87ldd7lh Nctnbnmxuu6MwvDZAeT9cGJg9DU7R+Qzs8TvSM/5pogmUwbvb3PTqYO9XLrUQYemSfG/ IguOh1qfFhUWz/s1EA17+hGBkXaJI7HGGvouugM6jSd6MIHThajg6Eo0IZmUBrCyFsGp csTw== X-Gm-Message-State: ACgBeo1MR665WjiNV5VmPLPgVNLueRmXeaOLT+RuHqCtAik+qzRVRxTh 0QR5ItLvyrOpAkBModWvptpYnKr3US/F X-Received: by 2002:a37:42d3:0:b0:69c:830d:6e51 with SMTP id p202-20020a3742d3000000b0069c830d6e51mr6490059qka.302.1659733250510; Fri, 05 Aug 2022 14:00:50 -0700 (PDT) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:5059:388d:ef36:5554]) by smtp.gmail.com with ESMTPSA id e11-20020ac8010b000000b0031f27b82268sm3300678qtg.71.2022.08.05.14.00.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 05 Aug 2022 14:00:50 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Aug 2022 16:00:39 -0500 Message-Id: <20220805210039.4158-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lswr: take const AVChannelLayout* in swr_alloc_set_opts2() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xFxvEufbrTNJ This is fully backwards-compatible in both ABI and API, so it's only a minor bump. --- libswresample/swresample.c | 4 ++-- libswresample/swresample.h | 4 ++-- libswresample/version.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 9b77ef65bf..123ac65693 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -83,8 +83,8 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif int swr_alloc_set_opts2(struct SwrContext **ps, - AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, - AVChannelLayout *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, + const AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, + const AVChannelLayout *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, int log_offset, void *log_ctx) { struct SwrContext *s = *ps; int ret; diff --git a/libswresample/swresample.h b/libswresample/swresample.h index 26d42fab8d..980be65783 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -286,8 +286,8 @@ struct SwrContext *swr_alloc_set_opts(struct SwrContext *s, * On error, the Swr context is freed and *ps set to NULL. */ int swr_alloc_set_opts2(struct SwrContext **ps, - AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, - AVChannelLayout *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, + const AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, + const AVChannelLayout *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, int log_offset, void *log_ctx); /** * @} diff --git a/libswresample/version.h b/libswresample/version.h index 66bac2fa9b..4b9952d914 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -30,7 +30,7 @@ #include "version_major.h" -#define LIBSWRESAMPLE_VERSION_MINOR 8 +#define LIBSWRESAMPLE_VERSION_MINOR 9 #define LIBSWRESAMPLE_VERSION_MICRO 100 #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \