|
 |
26f02f8 |
From d41eb72cd4545c394578332e5c102dee69e02ee8 Mon Sep 17 00:00:00 2001
|
|
|
26f02f8 |
From: Remi Collet <fedora@famillecollet.com>
|
|
|
26f02f8 |
Date: Tue, 7 Apr 2015 13:11:03 +0200
|
|
|
26f02f8 |
Subject: [PATCH] Fix build with latest libvpx 1.4.0
|
|
|
26f02f8 |
|
|
|
26f02f8 |
These new constants exist at least since 1.0.0
|
|
|
26f02f8 |
Compatibility ones have been droped in 1.4.0
|
|
|
26f02f8 |
---
|
|
|
26f02f8 |
src/webpimg.c | 14 +++++++-------
|
|
|
26f02f8 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
26f02f8 |
|
|
|
26f02f8 |
diff --git a/src/webpimg.c b/src/webpimg.c
|
|
|
26f02f8 |
index cf73d64..e49fcc6 100644
|
|
|
26f02f8 |
--- a/src/webpimg.c
|
|
|
26f02f8 |
+++ b/src/webpimg.c
|
|
|
26f02f8 |
@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* Y,
|
|
|
26f02f8 |
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
|
|
|
26f02f8 |
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
|
|
|
26f02f8 |
|
|
|
26f02f8 |
- vpx_img_wrap(&img, IMG_FMT_I420,
|
|
|
26f02f8 |
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
|
|
|
26f02f8 |
y_width, y_height, 16, (uint8*)(Y));
|
|
|
26f02f8 |
- img.planes[PLANE_Y] = (uint8*)(Y);
|
|
|
26f02f8 |
- img.planes[PLANE_U] = (uint8*)(U);
|
|
|
26f02f8 |
- img.planes[PLANE_V] = (uint8*)(V);
|
|
|
26f02f8 |
- img.stride[PLANE_Y] = y_stride;
|
|
|
26f02f8 |
- img.stride[PLANE_U] = uv_stride;
|
|
|
26f02f8 |
- img.stride[PLANE_V] = uv_stride;
|
|
|
26f02f8 |
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
|
|
|
26f02f8 |
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
|
|
|
26f02f8 |
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
|
|
|
26f02f8 |
+ img.stride[VPX_PLANE_Y] = y_stride;
|
|
|
26f02f8 |
+ img.stride[VPX_PLANE_U] = uv_stride;
|
|
|
26f02f8 |
+ img.stride[VPX_PLANE_V] = uv_stride;
|
|
|
26f02f8 |
|
|
|
26f02f8 |
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
|
|
|
26f02f8 |
|