Merge release-specific changes for 0.9.10-incubating back to master.
This commit is contained in:
commit
ecc3a7d49b
@ -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@ \
|
||||||
|
@ -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 */
|
||||||
|
@ -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@ \
|
||||||
|
Loading…
Reference in New Issue
Block a user