summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/opus-1.1/silk/float/solve_LS_FLP.c2
-rw-r--r--src/opusfile-0.5/src/opusfile.c6
-rw-r--r--src/renderercommon/qgl.h6
-rw-r--r--src/renderergl2/tr_extensions.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/opus-1.1/silk/float/solve_LS_FLP.c b/src/opus-1.1/silk/float/solve_LS_FLP.c
index 7c90d665..b35f0a57 100644
--- a/src/opus-1.1/silk/float/solve_LS_FLP.c
+++ b/src/opus-1.1/silk/float/solve_LS_FLP.c
@@ -163,7 +163,7 @@ static OPUS_INLINE void silk_LDL_FLP(
opus_int i, j, k, loop_count, err = 1;
silk_float *ptr1, *ptr2;
double temp, diag_min_value;
- silk_float v[ MAX_MATRIX_SIZE ], D[ MAX_MATRIX_SIZE ]; /* temp arrays*/
+ silk_float v[ MAX_MATRIX_SIZE ] = { 0 }, D[ MAX_MATRIX_SIZE ]; /* temp arrays*/
silk_assert( M <= MAX_MATRIX_SIZE );
diff --git a/src/opusfile-0.5/src/opusfile.c b/src/opusfile-0.5/src/opusfile.c
index 392ddb29..aaabdd1c 100644
--- a/src/opusfile-0.5/src/opusfile.c
+++ b/src/opusfile-0.5/src/opusfile.c
@@ -1715,7 +1715,7 @@ opus_int64 op_raw_total(const OggOpusFile *_of,int _li){
ogg_int64_t op_pcm_total(const OggOpusFile *_of,int _li){
OggOpusLink *links;
- ogg_int64_t diff;
+ ogg_int64_t diff=0;
int nlinks;
nlinks=_of->nlinks;
if(OP_UNLIKELY(_of->ready_state<OP_OPENED)
@@ -2166,7 +2166,7 @@ static int op_pcm_seek_page(OggOpusFile *_of,
ogg_int64_t _target_gp,int _li){
const OggOpusLink *link;
ogg_page og;
- ogg_int64_t pcm_pre_skip;
+ ogg_int64_t pcm_pre_skip=0;
ogg_int64_t pcm_start;
ogg_int64_t pcm_end;
ogg_int64_t best_gp;
@@ -2239,7 +2239,7 @@ static int op_pcm_seek_page(OggOpusFile *_of,
}
}
else{
- ogg_int64_t prev_page_gp;
+ ogg_int64_t prev_page_gp=0;
/*We might get lucky and already have the packet with the target
buffered.
Worth checking.
diff --git a/src/renderercommon/qgl.h b/src/renderercommon/qgl.h
index 6562f536..a0306897 100644
--- a/src/renderercommon/qgl.h
+++ b/src/renderercommon/qgl.h
@@ -45,7 +45,7 @@ extern void (APIENTRY * qglDrawRangeElementsEXT) (GLenum mode, GLuint start,
// GL_EXT_multi_draw_arrays
extern void (APIENTRY * qglMultiDrawArraysEXT) (GLenum, const GLint *, const GLsizei *, GLsizei);
-extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei);
+extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
// GL_ARB_shading_language_100
#ifndef GL_ARB_shading_language_100
@@ -632,8 +632,8 @@ extern void (APIENTRY * qglGetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint
extern void (APIENTRY * qglDrawRangeElementsEXT) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
// GL_EXT_multi_draw_arrays
-extern void (APIENTRY * qglMultiDrawArraysEXT) (GLenum, const GLint *, const GLsizei *, GLsizei);
-extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei);
+void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+extern void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
// GL_ARB_shading_language_100
#ifndef GL_ARB_shading_language_100
diff --git a/src/renderergl2/tr_extensions.c b/src/renderergl2/tr_extensions.c
index c7286ac7..bcc904af 100644
--- a/src/renderergl2/tr_extensions.c
+++ b/src/renderergl2/tr_extensions.c
@@ -34,7 +34,7 @@ void (APIENTRY * qglDrawRangeElementsEXT) (GLenum mode, GLuint start,
// GL_EXT_multi_draw_arrays
void (APIENTRY * qglMultiDrawArraysEXT) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
+void (APIENTRY * qglMultiDrawElementsEXT) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
// GL_ARB_vertex_shader
void (APIENTRY * qglBindAttribLocationARB) (GLhandleARB programObj, GLuint index, const GLcharARB * name);