diff --git a/drvapi_error_string.h b/drvapi_error_string.h index 18bfb1c..3c07b4f 100644 --- a/drvapi_error_string.h +++ b/drvapi_error_string.h @@ -441,7 +441,7 @@ s_CudaErrorStr sCudaDrvErrorString[] = // This is just a linear search through the array, since the error_id's are not // always ocurring consecutively -inline const char *getCudaDrvErrorString(CUresult error_id) +static inline const char *getCudaDrvErrorString(CUresult error_id) { int index = 0; diff --git a/openglosd.cpp b/openglosd.cpp index 27fc36c..43caf98 100644 --- a/openglosd.cpp +++ b/openglosd.cpp @@ -1444,7 +1444,7 @@ int cOglThread::StoreImage(const cImage &image) { tColor *argb = MALLOC(tColor, imgSize); if (!argb) { - esyslog("[softhddev]memory allocation of %d kb for OSD image failed", imgSize * sizeof(tColor) / 1024); + esyslog("[softhddev]memory allocation of %ld kb for OSD image failed", (imgSize * sizeof(tColor)) / 1024); ClearSlot(slot); slot = 0; return 0; @@ -1604,6 +1604,7 @@ bool cOglThread::InitOpenGL(void) { buffer[0] = strdup("openglosd"); buffer[1] = strdup("-display"); buffer[2] = strdup(displayName); + char **argv = buffer; glutInit(&argc, argv); glutInitDisplayMode (GLUT_SINGLE | GLUT_RGBA | GLUT_ALPHA); @@ -1614,7 +1615,7 @@ bool cOglThread::InitOpenGL(void) { free(buffer[0]); free(buffer[1]); free(buffer[2]); - + GLenum err = glewInit(); if( err != GLEW_OK) { esyslog("[softhddev]glewInit failed, aborting\n"); @@ -2040,7 +2041,7 @@ void cOglOsd::Flush(void) { //clear buffer //uint64_t start = cTimeMs::Now(); //dsyslog("[softhddev]Start Flush at %" PRIu64 "", cTimeMs::Now()); - + oglThread->DoCmd(new cOglCmdFill(bFb, clrTransparent)); diff --git a/video.c b/video.c index 30cfca1..9fcc0a2 100644 --- a/video.c +++ b/video.c @@ -1803,7 +1803,7 @@ int CuvidMessage(int level, const char *format, ...) #define checkCudaErrors(err) __checkCudaErrors (err, __FILE__, __LINE__) // These are the inline versions for all of the SDK helper functions -inline void __checkCudaErrors(CUresult err, const char *file, const int line) +static inline void __checkCudaErrors(CUresult err, const char *file, const int line) { if (CUDA_SUCCESS != err) { @@ -2190,7 +2190,7 @@ void SDK_CHECK_ERROR_GL() { GLenum gl_error = glGetError(); if (gl_error != GL_NO_ERROR) { - Fatal(_("video/cuvid: SDL error %d: %d\n"),gl_error); + Fatal(_("video/cuvid: SDL error %d\n"),gl_error); } }