From patchwork Mon Apr 19 14:10:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp565810iob; Mon, 19 Apr 2021 07:23:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyngrqPxyADcn3Yepl/8Ai9h2E6hghth586iuKKLsiQ87RwTg7Lh6d+U7bZxa0yIz1C68i2 X-Received: by 2002:a50:f395:: with SMTP id g21mr26480260edm.238.1618842218881; Mon, 19 Apr 2021 07:23:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842218; cv=none; d=google.com; s=arc-20160816; b=K601WKIdwog0xn+5/ThCdy2SOkgQqGcpls/nUdTvRT9Yw27e14uVHR9uoXgJPjt8+j J4sPcOBMu3YbFg1fBayvuNJe2i75Nyq8VZBYD9pA2w2SDgI6ISI6JTZAdveU096FlckP WoCn/pDtFIBx/Ilx4B6csJRPMCXrofFNs8MNKHgKJ2Nii36CGihOvBxJ/mqLy00YE+Pr 1bDW2jpN9Lm9PRNBzKUF+eaAJReDwFE18+3FRD0A0R4xOdCjN00n3agyIFxbXZmjM4PI JNmU1o3Xdvax9ETSNvAEF8CVAoiWPj/AbG4CC4Vkojt+pf10bQ46YJnNAO314yNJ2RhE GysA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=f99rXr/p0ykK4qiXT8Gsv8a0NLZnUOgYdK7S84+cV90=; b=y+FQw4uleFxpyGdVT4kfa+PLLN1f/D1nqX4MGJK2ySj7Pel3Q4U5U4jMAPEv3GiqrC DRCK/ExKhdRIe4yZP77aVMPCqCfAKKdhIhQ9XeEUj179xiu/xyV8KelH9GZ9TE5pjTAP +BVxbsXA5m/ao2Yw0Fra/Iinmv+I1v3MT41UetX1UvamV0ZwX/CUjzrE1JdyDtZ4kp+/ XdvJmj9tiEMnSjdh8b40tonzpMecQwd+aGCYuskuY43hytCZfxpzOtcf9Wa8Za4AHZR6 N14fWYYBiR7fM1VjaS43Ije/GFqYybHhywVjnafJAvbIvyPAre94eOXEgfF/dmeF/l3r 8CvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sqF07IN7; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q4si11794303edn.527.2021.04.19.07.23.38; Mon, 19 Apr 2021 07:23:38 -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=@gmail.com header.s=20161025 header.b=sqF07IN7; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A309689EC9; Mon, 19 Apr 2021 17:12:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84BB1689E53 for ; Mon, 19 Apr 2021 17:12:39 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id o5so35884083qkb.0 for ; Mon, 19 Apr 2021 07:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uuaIix8msinugCzZZ4bWR3EWA4A47ueQXAo01p7CBVU=; b=sqF07IN7xZnSCg+GVBM1JXvvWZbFW9EnznCnOHLOi+2HNlXIabAhgaWIFb+nhHDyya MchvKM5rKbB9NM4/VK9KclNxng0NoGXOKcIFXxh5t+AJaaQOixH92XQalqcHFANotS1w h/7K/mcLftbhqwN9XJJmSLj+6S0kELQD1tmhCLPTegejC199rAr7AwIMNzd3rS9S5i3B cNYF4Ie0Gbtep6c1IjQRkYz94/HrxQh20Sruqi+C4u1eN+qVsLjHpMnxHPoBVSGkgjtg 14XJwgMuFRDQMZ7zShaNKns0c7LllYYPLSQIVraNVhb+wVJJlUteC69u5K9M+7f1BNWM ZNdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uuaIix8msinugCzZZ4bWR3EWA4A47ueQXAo01p7CBVU=; b=hOcgvkcVd2eWDQ1i0MhmqI7EUb7do2HwLWk7IZw5qIWGenWFx9eSnkJlwUDntXpg8r 1CHzKEGrpymAUX5U9YPpa89uVuCzKDIAUe4xDnb00y9F0miZzYt/nXTl3dy1Z+NwoP21 42vVAKwN1Sh6oRIdMOaRd4aYDD5fK0zDGikQyU4H8nz93DYHat3/0UlYEREf3X+67Y+y Uk8RojtUtTRi+71MWQzV7lBadfDY4fXq9TJFen69brs8NASjeISIDhsfls9/aqxLfGc8 dkShi7K3+7Pt9sCovijJ+0c4fwpXPg8wpyYgom7jAPxzrpH2Ud6ohdhDDGSjWM2p9VvW 1uEQ== X-Gm-Message-State: AOAM532EGP34K6IkSOGnZiYQMX1jZf44+1+aqZxTswgvnQ6aqVYl1vmL EtoCQXOU0URpTMy8nFQ5eVnnKp7y8aA= X-Received: by 2002:a05:620a:1522:: with SMTP id n2mr6463960qkk.298.1618841558178; Mon, 19 Apr 2021 07:12:38 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:37 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:13 -0300 Message-Id: <20210419141024.8174-77-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 76/87] avdevice/avdevice: Constify avdevice_list_input_sources/output_sinks 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: /mLSVqYMKeyK From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 4 ++++ fftools/cmdutils.c | 4 ++-- libavdevice/avdevice.c | 4 ++-- libavdevice/avdevice.h | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index d19b817660..443cb84b27 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -17,6 +17,10 @@ API changes, most recent first: 2021-04-17 - xxxxxxxxxx - lavu 56.73.100 - frame.h detection_bbox.h Add AV_FRAME_DATA_DETECTION_BBOXES +2021-04-14 - xxxxxxxxxx - lavd yyyyyyyyy - avdevice.h + avdevice_list_input_sources and avdevice_list_output_sinks now accept + pointers to const AVInputFormat resp. const AVOutputFormat. + 2021-04-14 - xxxxxxxxxx - lavf yyyyyyyyy - avformat.h av_find_best_stream now uses a const AVCodec ** parameter for the returned decoder. diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 1db5e8cdd9..822fa8df45 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2205,7 +2205,7 @@ double get_rotation(AVStream *st) } #if CONFIG_AVDEVICE -static int print_device_sources(AVInputFormat *fmt, AVDictionary *opts) +static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts) { int ret, i; AVDeviceInfoList *device_list = NULL; @@ -2235,7 +2235,7 @@ static int print_device_sources(AVInputFormat *fmt, AVDictionary *opts) return ret; } -static int print_device_sinks(AVOutputFormat *fmt, AVDictionary *opts) +static int print_device_sinks(const AVOutputFormat *fmt, AVDictionary *opts) { int ret, i; AVDeviceInfoList *device_list = NULL; diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 554debcf06..22b7595ab1 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -120,7 +120,7 @@ static int list_devices_for_context(AVFormatContext *s, AVDictionary *options, return ret; } -int avdevice_list_input_sources(AVInputFormat *device, const char *device_name, +int avdevice_list_input_sources(const AVInputFormat *device, const char *device_name, AVDictionary *device_options, AVDeviceInfoList **device_list) { AVFormatContext *s = NULL; @@ -131,7 +131,7 @@ int avdevice_list_input_sources(AVInputFormat *device, const char *device_name, return list_devices_for_context(s, device_options, device_list); } -int avdevice_list_output_sinks(AVOutputFormat *device, const char *device_name, +int avdevice_list_output_sinks(const AVOutputFormat *device, const char *device_name, AVDictionary *device_options, AVDeviceInfoList **device_list) { AVFormatContext *s = NULL; diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 85a4dcc6df..d0b0f23f5d 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -507,9 +507,9 @@ void avdevice_free_list_devices(AVDeviceInfoList **device_list); * @return count of autodetected devices, negative on error. * @note device argument takes precedence over device_name when both are set. */ -int avdevice_list_input_sources(struct AVInputFormat *device, const char *device_name, +int avdevice_list_input_sources(const AVInputFormat *device, const char *device_name, AVDictionary *device_options, AVDeviceInfoList **device_list); -int avdevice_list_output_sinks(struct AVOutputFormat *device, const char *device_name, +int avdevice_list_output_sinks(const AVOutputFormat *device, const char *device_name, AVDictionary *device_options, AVDeviceInfoList **device_list); /**