GUACAMOLE-119: Merge integration of Apache Rat into client and associated new license notices.
diff --git a/src/guacenc/Makefile.am b/src/guacenc/Makefile.am
index 1f5c96b..4d22182 100644
--- a/src/guacenc/Makefile.am
+++ b/src/guacenc/Makefile.am
@@ -79,7 +79,7 @@
endif
guacenc_CFLAGS = \
- -Werror -Wall -pedantic \
+ -Werror -Wall \
@AVCODEC_CFLAGS@ \
@AVUTIL_CFLAGS@ \
@LIBGUAC_INCLUDE@ \
diff --git a/src/guacenc/video.c b/src/guacenc/video.c
index 874dd16..4ca84f6 100644
--- a/src/guacenc/video.c
+++ b/src/guacenc/video.c
@@ -397,7 +397,7 @@
/* 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 */
diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am
index c45585f..19cbf94 100644
--- a/src/terminal/Makefile.am
+++ b/src/terminal/Makefile.am
@@ -46,7 +46,7 @@
typescript.c
libguac_terminal_la_CFLAGS = \
- -Werror -Wall -pedantic \
+ -Werror -Wall \
@COMMON_INCLUDE@ \
@LIBGUAC_INCLUDE@ \
@PANGO_CFLAGS@ \
