From 88b6342bb5ee0f7435265fe0f09cfd7ba464d259 Mon Sep 17 00:00:00 2001 From: Jesse Talavera Date: Tue, 17 Dec 2024 14:57:06 -0500 Subject: [PATCH] Move up some declarations --- camera/drivers/ffmpeg.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/camera/drivers/ffmpeg.c b/camera/drivers/ffmpeg.c index f6912ab159..cadb40a1b7 100644 --- a/camera/drivers/ffmpeg.c +++ b/camera/drivers/ffmpeg.c @@ -118,7 +118,9 @@ static const AVInputFormat *ffmpeg_camera_choose_format(const char *device) static void *ffmpeg_camera_init(const char *device, uint64_t caps, unsigned width, unsigned height) { ffmpeg_camera_t *ffmpeg = NULL; - AVDictionary *options = NULL; + AVDeviceInfoList *device_list = NULL; + int result = 0; + int num_sources = 0; if ((caps & (UINT64_C(1) << RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER)) == 0) { /* If the core didn't ask for raw framebuffers... */ @@ -146,17 +148,18 @@ static void *ffmpeg_camera_init(const char *device, uint64_t caps, unsigned widt goto error; } - AVDeviceInfoList *device_list = NULL; + RARCH_LOG("[FFMPEG]: Using default camera backend: %s (%s, flags=0x%x)\n", ffmpeg->input_format->name, ffmpeg->input_format->long_name, ffmpeg->input_format->flags); + // TODO: Pick the best size for the camera - int result = av_dict_set(&ffmpeg->options, "video_size", "640x480", 0); + result = av_dict_set(&ffmpeg->options, "video_size", "640x480", 0); if (result < 0) { RARCH_ERR("[FFMPEG]: Failed to set option: %s\n", av_err2str(result)); goto error; } - int num_sources = avdevice_list_input_sources(ffmpeg->input_format, NULL, ffmpeg->options, &device_list); + num_sources = avdevice_list_input_sources(ffmpeg->input_format, NULL, ffmpeg->options, &device_list); if (num_sources == 0) { RARCH_ERR("[FFMPEG]: No video input sources found.\n");