diff --git a/src/media/avrecorder.cpp b/src/media/avrecorder.cpp
index ca3ecf681..fe5ada279 100644
--- a/src/media/avrecorder.cpp
+++ b/src/media/avrecorder.cpp
@@ -38,8 +38,8 @@ Impl::Impl(Config cfg) :
 	max_duration_(cfg.max_duration),
 
 	container_(std::make_unique<WebmContainer>(MediaContainer::Config {
-		.file_name = cfg.file_name,
-		.destructor_callback = [this](const MediaContainer& container) { container_dtor_handler(container); },
+		cfg.file_name,
+		[this](const MediaContainer& container) { container_dtor_handler(container); },
 	})),
 
 	audio_encoder_(make_audio_encoder(cfg)),
@@ -60,10 +60,7 @@ std::unique_ptr<AudioEncoder> Impl::make_audio_encoder(const Config cfg) const
 
 	const Config::Audio& a = *cfg.audio;
 
-	return container_->make_audio_encoder({
-		.channels = 2,
-		.sample_rate = a.sample_rate,
-	});
+	return container_->make_audio_encoder({2, a.sample_rate});
 }
 
 std::unique_ptr<VideoEncoder> Impl::make_video_encoder(const Config cfg) const
@@ -75,12 +72,7 @@ std::unique_ptr<VideoEncoder> Impl::make_video_encoder(const Config cfg) const
 
 	const Config::Video& v = *cfg.video;
 
-	return container_->make_video_encoder({
-		.width = v.width,
-		.height = v.height,
-		.frame_rate = v.frame_rate,
-		.buffer_method = kBufferMethod,
-	});
+	return container_->make_video_encoder({v.width, v.height, v.frame_rate, kBufferMethod});
 }
 
 Impl::~Impl()
diff --git a/src/media/options_values.cpp b/src/media/options_values.cpp
index f6ee474ba..7c7615871 100644
--- a/src/media/options_values.cpp
+++ b/src/media/options_values.cpp
@@ -27,9 +27,9 @@ std::vector<consvar_t*> Options::cvars_;
 // clang-format off
 const Options VorbisEncoder::options_("vorbis", {
 	{"quality",			Options::values<float>("0", {-0.1f, 1.f})},
-	{"max_bitrate",		Options::values<int>("-1", {.min = -1})},
-	{"nominal_bitrate",	Options::values<int>("-1", {.min = -1})},
-	{"min_bitrate",		Options::values<int>("-1", {.min = -1})},
+	{"max_bitrate",		Options::values<int>("-1", {-1})},
+	{"nominal_bitrate",	Options::values<int>("-1", {-1})},
+	{"min_bitrate",		Options::values<int>("-1", {-1})},
 });
 
 const Options VP8Encoder::options_("vp8", {
@@ -39,20 +39,20 @@ const Options VP8Encoder::options_("vp8", {
 		{"cq", VPX_CQ},
 		{"q", VPX_Q},
 	})},
-	{"target_bitrate", Options::values<int>("800", {.min = 1})},
+	{"target_bitrate", Options::values<int>("800", {1})},
 	{"min_q", Options::values<int>("4", {4, 63})},
 	{"max_q", Options::values<int>("55", {4, 63})},
-	{"kf_min", Options::values<int>("0", {.min = 0})},
-	{"kf_max", Options::values<int>("auto", {.min = 0}, {
+	{"kf_min", Options::values<int>("0", {0})},
+	{"kf_max", Options::values<int>("auto", {0}, {
 		{"auto", static_cast<int>(KeyFrameOption::kAuto)},
 	})},
 	{"cpu_used", Options::values<int>("0", {-16, 16})},
 	{"cq_level", Options::values<int>("10", {0, 63})},
-	{"deadline", Options::values<int>("10", { .min = 1}, {
+	{"deadline", Options::values<int>("10", {1}, {
 		{"infinite", static_cast<int>(DeadlineOption::kInfinite)},
 	})},
 	{"sharpness", Options::values<int>("7", {0, 7})},
 	{"token_parts", Options::values<int>("0", {0, 3})},
-	{"threads", Options::values<int>("1", {.min = 1})},
+	{"threads", Options::values<int>("1", {1})},
 });
 // clang-format on