From d7e0d428faaa04e2fd850eca82f314ca2ad3dfe5 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 25 Feb 2021 02:54:18 +0100 Subject: [PATCH] avdevice/avdevice: Constify avdevice_list_input_sources/output_sinks Signed-off-by: Andreas Rheinhardt Signed-off-by: James Almer --- 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 9a5cfa7dc03..c4a112bd9ff 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-04-27 - 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-27 - 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 1db5e8cdd98..822fa8df456 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 554debcf064..22b7595ab13 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 85a4dcc6df9..d0b0f23f5dd 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); /** -- 2.39.2