summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/mjpeg_encoder.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
index f7348da1..9b331c17 100644
--- a/server/mjpeg_encoder.c
+++ b/server/mjpeg_encoder.c
@@ -329,7 +329,8 @@ spice_jpeg_mem_dest(j_compress_ptr cinfo,
static inline uint32_t mjpeg_encoder_get_source_fps(MJpegEncoder *encoder)
{
- return encoder->cbs.get_source_fps(encoder->cbs_opaque);
+ return encoder->cbs.get_source_fps ?
+ encoder->cbs.get_source_fps(encoder->cbs_opaque) : MJPEG_MAX_FPS;
}
static inline uint32_t mjpeg_encoder_get_latency(MJpegEncoder *encoder)
@@ -1347,8 +1348,6 @@ MJpegEncoder *mjpeg_encoder_new(uint64_t starting_bit_rate,
{
MJpegEncoder *encoder = spice_new0(MJpegEncoder, 1);
- spice_assert(!cbs || (cbs && cbs->get_roundtrip_ms && cbs->get_source_fps));
-
encoder->first_frame = TRUE;
encoder->rate_control.byte_rate = starting_bit_rate / 8;
encoder->starting_bit_rate = starting_bit_rate;