From: Steinar H. Gunderson Date: Wed, 12 Sep 2018 17:58:33 +0000 (+0200) Subject: Fix 32-bit compilation issues. X-Git-Tag: 1.4.1~1 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a3df546ba8ea6fde76bcad14cef5396c024b24be;p=cubemap Fix 32-bit compilation issues. --- diff --git a/server.cpp b/server.cpp index 61bdb3f..52f26db 100644 --- a/server.cpp +++ b/server.cpp @@ -672,7 +672,7 @@ sending_header_or_short_response_again: // 100 kB prebuffer but end up sending a 10 MB GOP. assert(client->stream_pos == Client::STREAM_POS_AT_END); assert(client->stream_pos_end == Client::STREAM_POS_NO_END); - deque::const_iterator starting_point_it = + deque::const_iterator starting_point_it = lower_bound(stream->suitable_starting_points.begin(), stream->suitable_starting_points.end(), stream->bytes_received - stream->prebuffering_bytes); diff --git a/stream.h b/stream.h index 8d249c3..5d570fd 100644 --- a/stream.h +++ b/stream.h @@ -115,7 +115,7 @@ struct Stream { double pts; }; std::deque fragments; - size_t first_fragment_index = 0, discontinuity_counter = 0; + uint64_t first_fragment_index = 0, discontinuity_counter = 0; // HLS target duration, in seconds. unsigned hls_frag_duration = 6;