commit | 020a1e7006b5927d6bf957dc51d38366ec9a458e | [log] [tgz] |
---|---|---|
author | Guillaume Martres <smarter3@gmail.com> | Tue Dec 10 14:49:10 2013 -0800 |
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | Tue Dec 10 14:49:10 2013 -0800 |
tree | 59f5c77076f55dcf68e498bdfcfb0e09706b9533 | |
parent | 35b7b0b549b763b849a49e002d12dc7472cfd882 [diff] | |
parent | 0102f1d5ecda28a23d14bf9cdfdd49792e70b27b [diff] |
Merge "avoid crash when using --best on cpus with SSE3 (but not SSE4) support"
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index efdb612..fee11fd 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c
@@ -1726,7 +1726,7 @@ check_here = r * mv_stride + in_what + col_min; c = col_min; - while ((c + 2) < col_max) { + while ((c + 2) < col_max && fn_ptr->sdx3f != NULL) { int i; fn_ptr->sdx3f(what, what_stride, check_here, in_what_stride, sad_array);