From b306cebd6beb26d8c7503d4efe993624b48f4847 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Tue, 14 Jan 2020 01:39:13 +0100 Subject: [PATCH] project: More warnings fixed --- source/encoders/handlers/debug_handler.cpp | 18 ++---------------- source/ffmpeg/tools.cpp | 3 ++- source/obs/obs-tools.cpp | 1 - 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/source/encoders/handlers/debug_handler.cpp b/source/encoders/handlers/debug_handler.cpp index ddb5e22..76af67c 100644 --- a/source/encoders/handlers/debug_handler.cpp +++ b/source/encoders/handlers/debug_handler.cpp @@ -143,14 +143,7 @@ void debug_handler::get_properties(obs_properties_t*, const AVCodec* codec, AVCo case AV_OPT_TYPE_STRING: out = opt->default_val.str; break; - case AV_OPT_TYPE_BINARY: - case AV_OPT_TYPE_IMAGE_SIZE: - case AV_OPT_TYPE_PIXEL_FMT: - case AV_OPT_TYPE_SAMPLE_FMT: - case AV_OPT_TYPE_VIDEO_RATE: - case AV_OPT_TYPE_DURATION: - case AV_OPT_TYPE_COLOR: - case AV_OPT_TYPE_CHANNEL_LAYOUT: + default: break; } @@ -187,14 +180,7 @@ void debug_handler::get_properties(obs_properties_t*, const AVCodec* codec, AVCo case AV_OPT_TYPE_STRING: out = opt->default_val.str ? opt->default_val.str : ""; break; - case AV_OPT_TYPE_BINARY: - case AV_OPT_TYPE_IMAGE_SIZE: - case AV_OPT_TYPE_PIXEL_FMT: - case AV_OPT_TYPE_SAMPLE_FMT: - case AV_OPT_TYPE_VIDEO_RATE: - case AV_OPT_TYPE_DURATION: - case AV_OPT_TYPE_COLOR: - case AV_OPT_TYPE_CHANNEL_LAYOUT: + default: break; } } diff --git a/source/ffmpeg/tools.cpp b/source/ffmpeg/tools.cpp index 1adb19b..228f299 100644 --- a/source/ffmpeg/tools.cpp +++ b/source/ffmpeg/tools.cpp @@ -112,8 +112,9 @@ const char* tools::get_color_space_name(AVColorSpace v) return "BT.2100"; case AVCOL_SPC_NB: return "Not Part of ABI"; + default: + return "Unknown"; } - return "Unknown"; } const char* tools::get_error_description(int error) diff --git a/source/obs/obs-tools.cpp b/source/obs/obs-tools.cpp index a7c5a06..6fc7230 100644 --- a/source/obs/obs-tools.cpp +++ b/source/obs/obs-tools.cpp @@ -141,7 +141,6 @@ bool obs::tools::obs_properties_remove_by_name(obs_properties_t* props, const ch } auto rprops = reinterpret_cast<_hack_obs_properties*>(props); - auto rprop = reinterpret_cast<_hack_obs_property*>(obs_properties_get(props, name)); for (_hack_obs_property *el_prev = rprops->first_property, *el_cur = el_prev; el_cur != nullptr; el_prev = el_cur, el_cur = el_cur->next) {