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

GUACAMOLE-465: Remove redundant newline character from calls to guacenc_log().

Browse Source
This commit is contained in:
Michael Jumper 2020-06-24 13:28:52 -07:00
parent 3a87dd0c96
commit 4ac0940e81
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/guacenc/video.c
View File

@ -56,7 +56,7 @@ guacenc_video* guacenc_video_alloc(const char* path, const char* codec_name,
/* allocate the output media context */ /* allocate the output media context */
avformat_alloc_output_context2(&container_format_context, NULL, NULL, path); avformat_alloc_output_context2(&container_format_context, NULL, NULL, path);
if (container_format_context == NULL) { if (container_format_context == NULL) {
guacenc_log(GUAC_LOG_ERROR, "Failed to determine container from output file name\n"); guacenc_log(GUAC_LOG_ERROR, "Failed to determine container from output file name");
goto fail_codec; goto fail_codec;
} }
@ -74,7 +74,7 @@ guacenc_video* guacenc_video_alloc(const char* path, const char* codec_name,
video_stream = NULL; video_stream = NULL;
video_stream = avformat_new_stream(container_format_context, codec); video_stream = avformat_new_stream(container_format_context, codec);
if (video_stream == NULL) { if (video_stream == NULL) {
guacenc_log(GUAC_LOG_ERROR, "Could not allocate encoder stream. Cannot continue.\n"); guacenc_log(GUAC_LOG_ERROR, "Could not allocate encoder stream. Cannot continue.");
goto fail_format_context; goto fail_format_context;
} }
video_stream->id = container_format_context->nb_streams - 1; video_stream->id = container_format_context->nb_streams - 1;
@ -124,7 +124,7 @@ guacenc_video* guacenc_video_alloc(const char* path, const char* codec_name,
if (!(container_format->flags & AVFMT_NOFILE)) { if (!(container_format->flags & AVFMT_NOFILE)) {
ret = avio_open(&container_format_context->pb, path, AVIO_FLAG_WRITE); ret = avio_open(&container_format_context->pb, path, AVIO_FLAG_WRITE);
if (ret < 0) { if (ret < 0) {
guacenc_log(GUAC_LOG_ERROR, "Error occurred while opening output file.\n"); guacenc_log(GUAC_LOG_ERROR, "Error occurred while opening output file.");
goto fail_output_avio; goto fail_output_avio;
} }
} }
@ -132,7 +132,7 @@ guacenc_video* guacenc_video_alloc(const char* path, const char* codec_name,
/* write the stream header, if needed */ /* write the stream header, if needed */
ret = avformat_write_header(container_format_context, NULL); ret = avformat_write_header(container_format_context, NULL);
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.");
failed_header = true; failed_header = true;
goto fail_output_file; goto fail_output_file;
} }
@ -483,7 +483,7 @@ int guacenc_video_free(guacenc_video* video) {
/* write trailer, if needed */ /* write trailer, if needed */
if (video->container_format_context != NULL && if (video->container_format_context != NULL &&
video->output_stream != NULL) { video->output_stream != NULL) {
guacenc_log(GUAC_LOG_DEBUG, "Writing trailer: %d\n", guacenc_log(GUAC_LOG_DEBUG, "Writing trailer: %d",
av_write_trailer(video->container_format_context) == 0 ? av_write_trailer(video->container_format_context) == 0 ?
"success" : "failure"); "success" : "failure");
} }