scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 06:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed CIDs 393106-393108

Browse Source
This commit is contained in:
Martin Pulec
2022-05-20 08:42:13 +02:00
parent c2902609ea
commit 65ca72eb24
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gl_context.c
View File

@@ -178,7 +178,7 @@ GLuint glsl_compile_link(const char *vprogram, const char *fprogram)
if (strlen(log) > 0) {
log_msg(LOG_LEVEL_INFO, "Vertex compile log: %s\n", log);
}
glGetShaderiv(fhandle, GL_COMPILE_STATUS, &status);
glGetShaderiv(vhandle, GL_COMPILE_STATUS, &status);
assert(status == GL_TRUE);
}

2
src/video_capture/rtsp.c
View File

@@ -656,7 +656,7 @@ static CURL *init_curl() {
fprintf(stderr, "[rtsp] curl_easy_init() failed\n");
return NULL;
}
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
my_curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1, );
return curl;
}

4
src/video_capture/screen_x11.c
View File

@@ -143,8 +143,8 @@ static bool initialize(struct vidcap_screen_x11_state *s) {
XGetWindowAttributes(s->dpy, DefaultRootWindow(s->dpy), &wa);
s->tile->width = IF_NOT_NULL_ELSE(MIN(s->width, wa.width), wa.width);
s->tile->height = IF_NOT_NULL_ELSE(MIN(s->height, wa.height), wa.height);
s->x = MAX(0, MIN(s->x, wa.width - s->tile->width));
s->y = MAX(0, MIN(s->y, wa.height - s->tile->height));
s->x = MIN(s->x, wa.width - (int) s->tile->width);
s->y = MIN(s->y, wa.height - (int) s->tile->height);
pthread_mutex_init(&s->lock, NULL);
pthread_cond_init(&s->boss_cv, NULL);