From 046732ca65979fcc3dc89e03286a6d9a9afc6d87 Mon Sep 17 00:00:00 2001 From: Urvang Joshi Date: Thu, 6 Nov 2014 13:52:48 -0800 Subject: [PATCH] WebPEncode: Support encoding same pic twice (even if modified) This wasn't working for this specific scenario: - Encode an RGBA 'pic' (with trivial alpha) using lossy encoding. (so that pic->a == NULL after import happens). - Modify the 'pic->argb' so that it has non-trivial alpha. - Encode the same 'pic' again. This used to fail to encode alpha data as pic->a == NULL. (cherry picked from commit e4f4dddba3719faaeebe5bc74c2436756b966d44) Change-Id: Ieaaa7bd09825c42f54fbd99e6781d98f0b19cc0c --- src/enc/webpenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/enc/webpenc.c b/src/enc/webpenc.c index 0cb83f12..ca85e0b8 100644 --- a/src/enc/webpenc.c +++ b/src/enc/webpenc.c @@ -326,7 +326,7 @@ int WebPEncode(const WebPConfig* config, WebPPicture* pic) { if (!config->lossless) { VP8Encoder* enc = NULL; - if (pic->y == NULL || pic->u == NULL || pic->v == NULL) { + if (pic->use_argb || pic->y == NULL || pic->u == NULL || pic->v == NULL) { // Make sure we have YUVA samples. if (config->preprocessing & 4) { #if WEBP_ENCODER_ABI_VERSION > 0x0204