GUACAMOLE-68: Merge fix for FFmpeg, Pango related build issues.

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@       \

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 */

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@           \