scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-05 10:04:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Martin Pulec
2011-12-28 18:18:42 +01:00
parent 8b62f994c0
commit 5671e45d91
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ultragrid/src/audio/audio.c
View File

@@ -384,8 +384,10 @@ error:
void audio_join(struct state_audio *s) {
if(s) {
pthread_join(s->audio_receiver_thread_id, NULL);
pthread_join(s->audio_sender_thread_id, NULL);
if(s->audio_receiver_thread_id)
pthread_join(s->audio_receiver_thread_id, NULL);
if(s->audio_sender_thread_id)
pthread_join(s->audio_sender_thread_id, NULL);
}
}

2
ultragrid/src/video_display.c
View File

@@ -110,7 +110,7 @@ static display_table_t display_device_table[] = {
display_gl_init,
display_gl_run,
display_gl_done,
NULL,
display_gl_finish,
display_gl_getf,
display_gl_putf,
display_gl_reconfigure,

9
ultragrid/src/video_display/gl.c
View File

@@ -987,6 +987,15 @@ void display_gl_done(void *state)
free(s);
}
void display_gl_finish(void *state)
{
struct state_gl *s = (struct state_gl *) state;
assert(s->magic == MAGIC_GL);
s->processed = TRUE;
}
struct video_frame * display_gl_getf(void *state)
{
struct state_gl *s = (struct state_gl *) state;

1
ultragrid/src/video_display/gl.h
View File

@@ -56,6 +56,7 @@ display_type_t *display_gl_probe(void);
void *display_gl_init(char *fmt, unsigned int flags);
void display_gl_run(void *state);
void display_gl_done(void *state);
void display_gl_finish(void *state);
struct video_frame *display_gl_getf(void *state);
int display_gl_putf(void *state, char *frame);
int display_gl_reconfigure(void *state, struct video_desc desc);

2
ultragrid/src/video_display/sage.h
View File

@@ -56,7 +56,7 @@ void display_sage_run(void *state);
void display_sage_done(void *state);
struct video_frame *display_sage_getf(void *state);
int display_sage_putf(void *state, char *frame);
void display_sage_reconfigure(void *state, struct video_desc desc);
int display_sage_reconfigure(void *state, struct video_desc desc);
int display_sage_get_property(void *state, int property, void *val, size_t *len);
int display_sage_handle_events(void);