Merge "always call WebPInitSamplers(), don't try to be smart"

This commit is contained in:
James Zern 2015-11-23 22:23:21 +00:00 committed by Gerrit Code Review
commit 158763dea3

View File

@ -536,6 +536,7 @@ static int CustomSetup(VP8Io* io) {
}
} else {
if (is_rgb) {
WebPInitSamplers();
p->emit = EmitSampledRGB; // default
if (io->fancy_upsampling) {
#ifdef FANCY_UPSAMPLING
@ -550,8 +551,6 @@ static int CustomSetup(VP8Io* io) {
p->emit = EmitFancyRGB;
WebPInitUpsamplers();
#endif
} else {
WebPInitSamplers();
}
} else {
p->emit = EmitYUV;