X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=1a4a3f9d3c292f4d4aaa85a4415c8420bc1083b7;hb=607f05fc1c946bae0e436c2e551e07364a49ebcf;hp=e46d918d6d8421312725dfc872d5730cd5010bc0;hpb=35d4e46a1e3628c7be6566f2a985bc7da435cdf9;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index e46d918..1a4a3f9 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -204,7 +204,7 @@ float find_peak(const float *samples, size_t num_samples)
 {
 	float m = fabs(samples[0]);
 	for (size_t i = 1; i < num_samples; ++i) {
-		m = std::max(m, fabs(samples[i]));
+		m = max(m, fabs(samples[i]));
 	}
 	return m;
 }
@@ -353,6 +353,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 		clock_gettime(CLOCK_MONOTONIC, &frame_upload_start);
 	}
 	userdata->last_interlaced = interlaced;
+	userdata->last_frame_rate_nom = frame_rate_nom;
+	userdata->last_frame_rate_den = frame_rate_den;
 	RefCountedFrame new_frame(video_frame);
 
 	// Upload the textures.