Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx> --- server/dcc-encoders.c | 4 +--- server/dcc-encoders.h | 2 +- server/dcc.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/server/dcc-encoders.c b/server/dcc-encoders.c index c03409c..7497029 100644 --- a/server/dcc-encoders.c +++ b/server/dcc-encoders.c @@ -398,10 +398,8 @@ static void image_encoders_init_zlib(ImageEncoders *enc) } } -void dcc_encoders_init(DisplayChannelClient *dcc, ImageEncoderSharedData *shared_data) +void image_encoders_init(ImageEncoders *enc, ImageEncoderSharedData *shared_data) { - ImageEncoders *enc = &dcc->encoders; - spice_assert(shared_data); enc->shared_data = shared_data; diff --git a/server/dcc-encoders.h b/server/dcc-encoders.h index 596429c..2b4d556 100644 --- a/server/dcc-encoders.h +++ b/server/dcc-encoders.h @@ -41,7 +41,7 @@ void image_encoder_shared_init(ImageEncoderSharedData *shared_data); void image_encoder_shared_stat_reset(ImageEncoderSharedData *shared_data); void image_encoder_shared_stat_print(const ImageEncoderSharedData *shared_data); -void dcc_encoders_init(DisplayChannelClient *dcc, ImageEncoderSharedData *shared_data); +void image_encoders_init(ImageEncoders *enc, ImageEncoderSharedData *shared_data); void image_encoders_free(ImageEncoders *enc); void dcc_free_glz_drawable (DisplayChannelClient *dcc, RedGlzDrawable *drawable); diff --git a/server/dcc.c b/server/dcc.c index d73b742..1cc85b5 100644 --- a/server/dcc.c +++ b/server/dcc.c @@ -396,7 +396,7 @@ DisplayChannelClient *dcc_new(DisplayChannel *display, ring_init(&dcc->glz_drawables_inst_to_free); pthread_mutex_init(&dcc->glz_drawables_inst_to_free_lock, NULL); - dcc_encoders_init(dcc, &display->encoder_globals); + image_encoders_init(&dcc->encoders, &display->encoder_globals); return dcc; } -- 2.7.4 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel