summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2013-08-19 17:16:12 -0700
committerYaowu Xu <yaowu@google.com>2013-08-19 17:16:12 -0700
commitf70330a906fc42bbb6f7100ed1ad5800007b96bc (patch)
tree9384f1a2ad55fb95d91cecd8b6f83b9dc95c4039 /vp9
parent31c97c2bdfdbfff1188f6eaf51df2ee9d7eb1de7 (diff)
downloadlibvpx-f70330a906fc42bbb6f7100ed1ad5800007b96bc.tar
libvpx-f70330a906fc42bbb6f7100ed1ad5800007b96bc.tar.gz
libvpx-f70330a906fc42bbb6f7100ed1ad5800007b96bc.tar.bz2
libvpx-f70330a906fc42bbb6f7100ed1ad5800007b96bc.zip
fix a bug when null function pointer is used.
For certain partition size, the function poniter may not be intialized at all. The patch prevent the call if the pointer is not set. Change-Id: I78b8c3992b639e8799a16b3c74f0973d07b8b9ac
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_mcomp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c
index b6515e697..55e4c36de 100644
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -1824,7 +1824,7 @@ int vp9_full_search_sadx8(MACROBLOCK *x, int_mv *ref_mv,
}
}
- 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);