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

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

Browse Source
This commit is contained in:
James Muehlner 2016-11-13 11:01:25 -08:00
commit 0ea047ea25
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/guacenc/Makefile.am
View File

@ -79,7 +79,7 @@ noinst_HEADERS += webp.h
endif endif
guacenc_CFLAGS = \ guacenc_CFLAGS = \
-Werror -Wall -pedantic \ -Werror -Wall \
@AVCODEC_CFLAGS@ \ @AVCODEC_CFLAGS@ \
@AVUTIL_CFLAGS@ \ @AVUTIL_CFLAGS@ \
@LIBGUAC_INCLUDE@ \ @LIBGUAC_INCLUDE@ \

2
src/guacenc/video.c
View File

@ -397,7 +397,7 @@ void guacenc_video_prepare_frame(guacenc_video* video, guacenc_buffer* buffer) {
/* Prepare scaling context */ /* Prepare scaling context */
struct SwsContext* sws = sws_getContext(src->width, src->height, 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); SWS_BICUBIC, NULL, NULL, NULL);
/* Abort if scaling context could not be created */ /* Abort if scaling context could not be created */

2
src/terminal/Makefile.am
View File

@ -46,7 +46,7 @@ libguac_terminal_la_SOURCES = \
typescript.c typescript.c
libguac_terminal_la_CFLAGS = \ libguac_terminal_la_CFLAGS = \
-Werror -Wall -pedantic \ -Werror -Wall \
@COMMON_INCLUDE@ \ @COMMON_INCLUDE@ \
@LIBGUAC_INCLUDE@ \ @LIBGUAC_INCLUDE@ \
@PANGO_CFLAGS@ \ @PANGO_CFLAGS@ \