Merge "WebPEncode: An additional check. Start VP8EncLoop/VP8EncTokenLoop only if VP8EncStartAlpha succeeded."

This commit is contained in:
James Zern 2013-04-05 12:00:46 -07:00 committed by Gerrit Code Review
commit 5167ca4759

View File

@ -386,9 +386,9 @@ int WebPEncode(const WebPConfig* config, WebPPicture* pic) {
// Analysis is done, proceed to actual coding. // Analysis is done, proceed to actual coding.
ok = ok && VP8EncStartAlpha(enc); // possibly done in parallel ok = ok && VP8EncStartAlpha(enc); // possibly done in parallel
if (!enc->use_tokens_) { if (!enc->use_tokens_) {
ok = VP8EncLoop(enc); ok = ok && VP8EncLoop(enc);
} else { } else {
ok = VP8EncTokenLoop(enc); ok = ok && VP8EncTokenLoop(enc);
} }
ok = ok && VP8EncFinishAlpha(enc); ok = ok && VP8EncFinishAlpha(enc);
#ifdef WEBP_EXPERIMENTAL_FEATURES #ifdef WEBP_EXPERIMENTAL_FEATURES