maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-236: Ensure display allocation can handle video preparation failures.

Browse Source
This commit is contained in:
Michael Jumper 2016-03-10 17:31:35 -08:00
parent 19ac6e8286
commit d94915c515
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/guacenc/display.c
View File

@ -87,13 +87,18 @@ cairo_operator_t guacenc_display_cairo_operator(guac_composite_mode mask) {
guacenc_display* guacenc_display_alloc() { guacenc_display* guacenc_display_alloc() {
/* STUB: Prepare video encoding */
guacenc_video* video =
guacenc_video_alloc("/tmp/test.mpg", 640, 480, 25, 400000);
if (video == NULL)
return NULL;
/* Allocate display */ /* Allocate display */
guacenc_display* display = guacenc_display* display =
(guacenc_display*) calloc(1, sizeof(guacenc_display)); (guacenc_display*) calloc(1, sizeof(guacenc_display));
/* STUB: Prepare video encoding */ /* Associate display with video output */
display->output = guacenc_video_alloc("/tmp/test.mpg", display->output = video;
640, 480, 25, 400000);
return display; return display;