diff options
| author | Remi Collet <remi@php.net> | 2015-05-24 09:37:12 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-05-24 09:37:12 +0200 |
| commit | e807e07bfa22eefd5aebf13498c1df16c90afb0a (patch) | |
| tree | e6eecbcd5527741284ead5ebc3321f07a703d726 | |
| parent | d9c266f4c91ab4cbee1c334f078c63519ab21395 (diff) | |
| download | php-git-e807e07bfa22eefd5aebf13498c1df16c90afb0a.tar.gz | |
Fixed Bug #69479 GD fails to build with newer libvpx
From upstream https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8
Fix build with latest libvpx 1.4.0
These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
| -rw-r--r-- | ext/gd/libgd/webpimg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/gd/libgd/webpimg.c b/ext/gd/libgd/webpimg.c index 01bef93c48..1ea349586d 100644 --- a/ext/gd/libgd/webpimg.c +++ b/ext/gd/libgd/webpimg.c @@ -706,14 +706,14 @@ static WebPResult VPXEncode(const uint8* Y, codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0); codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2); - vpx_img_wrap(&img, IMG_FMT_I420, + vpx_img_wrap(&img, VPX_IMG_FMT_I420, y_width, y_height, 16, (uint8*)(Y)); - img.planes[PLANE_Y] = (uint8*)(Y); - img.planes[PLANE_U] = (uint8*)(U); - img.planes[PLANE_V] = (uint8*)(V); - img.stride[PLANE_Y] = y_stride; - img.stride[PLANE_U] = uv_stride; - img.stride[PLANE_V] = uv_stride; + img.planes[VPX_PLANE_Y] = (uint8*)(Y); + img.planes[VPX_PLANE_U] = (uint8*)(U); + img.planes[VPX_PLANE_V] = (uint8*)(V); + img.stride[VPX_PLANE_Y] = y_stride; + img.stride[VPX_PLANE_U] = uv_stride; + img.stride[VPX_PLANE_V] = uv_stride; res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY); |