From 9879eead83af095c22305334d1670e3bfbebfc33 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 9 Feb 2014 08:53:19 -0800 Subject: [PATCH] Fix a couple of warnings --- libobs/callback/calldata.c | 4 ++-- libobs/media-io/audio-io.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libobs/callback/calldata.c b/libobs/callback/calldata.c index 6645a66ad..3410a921e 100644 --- a/libobs/callback/calldata.c +++ b/libobs/callback/calldata.c @@ -56,7 +56,7 @@ static inline size_t cd_serialize_size(uint8_t **pos) static inline const char *cd_serialize_string(uint8_t **pos) { size_t size = cd_serialize_size(pos); - const char *str = *pos; + const char *str = (const char *)*pos; *pos += size; @@ -75,7 +75,7 @@ static bool cd_getparam(calldata_t data, const char *name, name_size = cd_serialize_size(pos); while (name_size != 0) { - const char *param_name = *pos; + const char *param_name = (const char *)*pos; size_t param_size; *pos += name_size; diff --git a/libobs/media-io/audio-io.c b/libobs/media-io/audio-io.c index 6c7e6a6da..e35cb8903 100644 --- a/libobs/media-io/audio-io.c +++ b/libobs/media-io/audio-io.c @@ -16,6 +16,7 @@ ******************************************************************************/ #include +#include #include "../util/threading.h" #include "../util/darray.h" @@ -142,8 +143,8 @@ static inline void clear_excess_audio_data(struct audio_line *line, line->base_timestamp); blog(LOG_WARNING, "Excess audio data for audio line '%s', somehow " - "audio data went back in time by %lu bytes. " - "prev_time: %llu, line->base_timestamp: %llu", + "audio data went back in time by %"PRIu32" bytes. " + "prev_time: %"PRIu64", line->base_timestamp: %"PRIu64, line->name, (uint32_t)size, prev_time, line->base_timestamp); @@ -558,7 +559,7 @@ static void audio_line_place_data_pos(struct audio_line *line, const struct audio_data *data, size_t position) { bool planar = line->audio->planes > 1; - size_t total_num = data->frames * planar ? 1 : line->audio->channels; + size_t total_num = data->frames * (planar ? 1 : line->audio->channels); size_t total_size = data->frames * line->audio->block_size; for (size_t i = 0; i < line->audio->planes; i++) {