diff options
| author | Remi Collet <remi@php.net> | 2015-05-24 09:40:08 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-05-24 09:40:08 +0200 |
| commit | fc8143f58a760df0c915d37afe65f6a15d52fc16 (patch) | |
| tree | 4ee8f959d1b89c2eabafc6cf1801d5853be5f847 | |
| parent | 35ba1601f54c7761e4e415ff2999d44701f8e5a2 (diff) | |
| parent | c630779648a3fd34d684e230527059403b06464c (diff) | |
| download | php-git-fc8143f58a760df0c915d37afe65f6a15d52fc16.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fixed Bug #69479 GD fails to build with newer libvpx
| -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 1f1c02322e..9d801a29a3 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); |