X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fvideo_encoder.cpp;h=2ac606ec5aea8674f1a31cc2ea763134d75deea4;hb=5a34f92eb0bf5fe911cb6ca72a18ad03ce9898ac;hp=8dee6da8307d47814f650302ad6d6ded2e78398e;hpb=b2313d869262960aa3bcaaf3f45f2a3b90d1fc18;p=nageru

diff --git a/nageru/video_encoder.cpp b/nageru/video_encoder.cpp
index 8dee6da..2ac606e 100644
--- a/nageru/video_encoder.cpp
+++ b/nageru/video_encoder.cpp
@@ -35,7 +35,7 @@ string generate_local_dump_filename(int frame)
 	localtime_r(&now, &now_tm);
 
 	char timestamp[64];
-	strftime(timestamp, sizeof(timestamp), "%F-%T%z", &now_tm);
+	strftime(timestamp, sizeof(timestamp), "%F-%H%M%S%z", &now_tm);
 
 	// Use the frame number to disambiguate between two cuts starting
 	// on the same second.
@@ -217,9 +217,9 @@ int VideoEncoder::write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType t
 
 	if (type == AVIO_DATA_MARKER_HEADER) {
 		stream_mux_header.append((char *)buf, buf_size);
-		httpd->set_header(HTTPD::MAIN_STREAM, stream_mux_header);
+		httpd->set_header(HTTPD::StreamID{ HTTPD::MAIN_STREAM, 0 }, stream_mux_header);
 	} else {
-		httpd->add_data(HTTPD::MAIN_STREAM, (char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
+		httpd->add_data(HTTPD::StreamID{ HTTPD::MAIN_STREAM, 0 }, (char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
 	}
 	return buf_size;
 }