From 4ea5f163f041b065d4efd138a9b6d03716bf0c43 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 12 Nov 2016 19:20:37 -0800 Subject: [PATCH 1/2] GUACAMOLE-68: Remove -pedantic flag for subprojects depending on libraries which use compiler extensions. --- src/guacenc/Makefile.am | 2 +- src/terminal/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guacenc/Makefile.am b/src/guacenc/Makefile.am index 1f5c96b1..4d22182a 100644 --- a/src/guacenc/Makefile.am +++ b/src/guacenc/Makefile.am @@ -79,7 +79,7 @@ noinst_HEADERS += webp.h endif guacenc_CFLAGS = \ - -Werror -Wall -pedantic \ + -Werror -Wall \ @AVCODEC_CFLAGS@ \ @AVUTIL_CFLAGS@ \ @LIBGUAC_INCLUDE@ \ diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am index c45585f1..19cbf949 100644 --- a/src/terminal/Makefile.am +++ b/src/terminal/Makefile.am @@ -46,7 +46,7 @@ libguac_terminal_la_SOURCES = \ typescript.c libguac_terminal_la_CFLAGS = \ - -Werror -Wall -pedantic \ + -Werror -Wall \ @COMMON_INCLUDE@ \ @LIBGUAC_INCLUDE@ \ @PANGO_CFLAGS@ \ From 406a58de352df2550888a58bf93c1a3bad6602f6 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 12 Nov 2016 19:21:37 -0800 Subject: [PATCH 2/2] GUACAMOLE-68: Use AV_PIX_FMT_RGB32 and AV_PIX_FMT_YUV420P constants (not PIX_FMT_RGB32 and PIX_FMT_YUV420P). --- src/guacenc/video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guacenc/video.c b/src/guacenc/video.c index 874dd16c..4ca84f69 100644 --- a/src/guacenc/video.c +++ b/src/guacenc/video.c @@ -397,7 +397,7 @@ void guacenc_video_prepare_frame(guacenc_video* video, guacenc_buffer* buffer) { /* Prepare scaling context */ struct SwsContext* sws = sws_getContext(src->width, src->height, - PIX_FMT_RGB32, dst->width, dst->height, PIX_FMT_YUV420P, + AV_PIX_FMT_RGB32, dst->width, dst->height, AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL); /* Abort if scaling context could not be created */