]>
Commit | Line | Data |
---|---|---|
f7322ca7 ER |
1 | Fix build with latest libvpx 1.4.0 |
2 | These new constants exist at least since 1.0.0 | |
3 | Compatibility ones have been droped in 1.4.0 | |
4 | ||
5 | https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8 | |
6 | ||
7 | From d242f958dfca03640356ea29f624005a895f64a0 Mon Sep 17 00:00:00 2001 | |
8 | From: Ole Markus With <olemarkus@olemarkus.org> | |
9 | Date: Sun, 24 May 2015 09:19:09 +0200 | |
10 | Subject: [PATCH] Fix for bug #69479: GD fails to build with newer libvpx | |
11 | ||
12 | --- | |
13 | ext/gd/libgd/webpimg.c | 14 +++++++------- | |
14 | 1 file changed, 7 insertions(+), 7 deletions(-) | |
15 | ||
16 | diff --git a/ext/gd/libgd/webpimg.c b/ext/gd/libgd/webpimg.c | |
17 | index 1f1c023..9d801a2 100644 | |
18 | --- a/ext/gd/libgd/webpimg.c | |
19 | +++ b/ext/gd/libgd/webpimg.c | |
20 | @@ -706,14 +706,14 @@ static WebPResult VPXEncode(const uint8* Y, | |
21 | codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0); | |
22 | codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2); | |
23 | ||
24 | - vpx_img_wrap(&img, IMG_FMT_I420, | |
25 | + vpx_img_wrap(&img, VPX_IMG_FMT_I420, | |
26 | y_width, y_height, 16, (uint8*)(Y)); | |
27 | - img.planes[PLANE_Y] = (uint8*)(Y); | |
28 | - img.planes[PLANE_U] = (uint8*)(U); | |
29 | - img.planes[PLANE_V] = (uint8*)(V); | |
30 | - img.stride[PLANE_Y] = y_stride; | |
31 | - img.stride[PLANE_U] = uv_stride; | |
32 | - img.stride[PLANE_V] = uv_stride; | |
33 | + img.planes[VPX_PLANE_Y] = (uint8*)(Y); | |
34 | + img.planes[VPX_PLANE_U] = (uint8*)(U); | |
35 | + img.planes[VPX_PLANE_V] = (uint8*)(V); | |
36 | + img.stride[VPX_PLANE_Y] = y_stride; | |
37 | + img.stride[VPX_PLANE_U] = uv_stride; | |
38 | + img.stride[VPX_PLANE_V] = uv_stride; | |
39 | ||
40 | res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY); | |
41 |