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

Merge staging/1.2.0 changes back to master.

Browse Source
This commit is contained in:
Nick Couchman 2020-06-24 20:09:05 -04:00
commit 37965a961e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/guacenc/video.c
View File

@ -133,13 +133,13 @@ guacenc_video* guacenc_video_alloc(const char* path, const char* codec_name,
if (ret < 0) { if (ret < 0) {
guacenc_log(GUAC_LOG_ERROR, "Error occurred while writing output file header.\n"); guacenc_log(GUAC_LOG_ERROR, "Error occurred while writing output file header.\n");
failed_header = true; failed_header = true;
goto fail_output_file;
} }
/* Allocate video structure */ /* Allocate video structure */
guacenc_video* video = malloc(sizeof(guacenc_video)); guacenc_video* video = malloc(sizeof(guacenc_video));
if (video == NULL) { if (video == NULL)
goto fail_output_file; goto fail_alloc_video;
}
/* Init properties of video */ /* Init properties of video */
video->output_stream = video_stream; video->output_stream = video_stream;
@ -154,16 +154,10 @@ guacenc_video* guacenc_video_alloc(const char* path, const char* codec_name,
video->last_timestamp = 0; video->last_timestamp = 0;
video->next_pts = 0; video->next_pts = 0;
if (failed_header) {
guacenc_log(GUAC_LOG_ERROR, "An incompatible codec/container "
"combination was specified. Cannot encode.\n");
goto fail_output_file;
}
return video; return video;
/* Free all allocated data in case of failure */ /* Free all allocated data in case of failure */
fail_alloc_video:
fail_output_file: fail_output_file:
avio_close(container_format_context->pb); avio_close(container_format_context->pb);
/* delete the file that was created if it was actually created */ /* delete the file that was created if it was actually created */