Merge "anim_diff: expose the -max_diff option"

This commit is contained in:
Pascal Massimino 2018-02-09 19:39:03 +00:00 committed by Gerrit Code Review
commit 499c395a35

View File

@ -187,11 +187,9 @@ static void Help(void) {
printf(" -min_psnr <float> ... minimum per-frame PSNR\n"); printf(" -min_psnr <float> ... minimum per-frame PSNR\n");
printf(" -raw_comparison ..... if this flag is not used, RGB is\n"); printf(" -raw_comparison ..... if this flag is not used, RGB is\n");
printf(" premultiplied before comparison\n"); printf(" premultiplied before comparison\n");
#ifdef WEBP_EXPERIMENTAL_FEATURES
printf(" -max_diff <int> ..... maximum allowed difference per channel " printf(" -max_diff <int> ..... maximum allowed difference per channel "
" between corresponding pixels in subsequent" " between corresponding pixels in subsequent"
" frames\n"); " frames\n");
#endif
} }
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
@ -236,7 +234,6 @@ int main(int argc, const char* argv[]) {
} }
} else if (!strcmp(argv[c], "-raw_comparison")) { } else if (!strcmp(argv[c], "-raw_comparison")) {
premultiply = 0; premultiply = 0;
#ifdef WEBP_EXPERIMENTAL_FEATURES
} else if (!strcmp(argv[c], "-max_diff")) { } else if (!strcmp(argv[c], "-max_diff")) {
if (c < argc - 1) { if (c < argc - 1) {
const char* const v = argv[++c]; const char* const v = argv[++c];
@ -250,7 +247,6 @@ int main(int argc, const char* argv[]) {
} else { } else {
parse_error = 1; parse_error = 1;
} }
#endif
} else { } else {
if (!got_input1) { if (!got_input1) {
files[0] = argv[c]; files[0] = argv[c];