jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of warnings

Browse Source
This commit is contained in:
jp9000 2014-02-09 08:53:19 -08:00
parent 8aa2b01eb9
commit 9879eead83
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/callback/calldata.c
View File

@ -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;

7
libobs/media-io/audio-io.c
View File

@ -16,6 +16,7 @@
******************************************************************************/
#include <math.h>
#include <inttypes.h>
#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++) {