Merge pull request #86 from fryshorts/fixes

Minor fixes for problems reported by valgrind
This commit is contained in:
Jim 2014-05-17 00:11:47 -07:00
commit 5351dd0d73
2 changed files with 10 additions and 1 deletions

View File

@ -276,9 +276,9 @@ void gl_platform_destroy(struct gl_platform *platform)
Display *dpy = platform->swap.wi->display;
glXMakeCurrent(dpy, None, NULL);
gl_platform_cleanup_swapchain(&platform->swap);
glXDestroyContext(dpy, platform->context);
gl_windowinfo_destroy(platform->swap.wi);
gl_platform_cleanup_swapchain(&platform->swap);
bfree(platform);
}

View File

@ -118,6 +118,15 @@ void obs_output_destroy(obs_output_t output)
if (output->context.data)
output->info.destroy(output->context.data);
if (output->video_encoder) {
obs_encoder_remove_output(output->video_encoder,
output);
}
if (output->audio_encoder) {
obs_encoder_remove_output(output->audio_encoder,
output);
}
pthread_mutex_destroy(&output->interleaved_mutex);
obs_context_data_free(&output->context);
bfree(output);