Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: source/libvpx/vpx_dsp/variance.h

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vpx_dsp/ssim.c ('k') | source/libvpx/vpx_dsp/vpx_convolve.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vpx_dsp/variance.h
diff --git a/source/libvpx/vpx_dsp/variance.h b/source/libvpx/vpx_dsp/variance.h
index c18d9b48fced5927491085578b94d053ec6a4dc7..cd0fd98785b0bccbcf875251bb77c2a93fa6fd1d 100644
--- a/source/libvpx/vpx_dsp/variance.h
+++ b/source/libvpx/vpx_dsp/variance.h
@@ -74,7 +74,7 @@ typedef struct variance_vtable {
} vp8_variance_fn_ptr_t;
#endif // CONFIG_VP8
-#if CONFIG_VP9
+#if CONFIG_VP9 || CONFIG_VP10
typedef struct vp9_variance_vtable {
vpx_sad_fn_t sdf;
vpx_sad_avg_fn_t sdaf;
@@ -85,7 +85,7 @@ typedef struct vp9_variance_vtable {
vpx_sad_multi_fn_t sdx8f;
vpx_sad_multi_d_fn_t sdx4df;
} vp9_variance_fn_ptr_t;
-#endif // CONFIG_VP9
+#endif // CONFIG_VP9 || CONFIG_VP10
#ifdef __cplusplus
} // extern "C"
« no previous file with comments | « source/libvpx/vpx_dsp/ssim.c ('k') | source/libvpx/vpx_dsp/vpx_convolve.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698