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

Unified Diff: source/libvpx/vpx_mem/vpx_mem.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/x86/vpx_subpixel_8t_intrin_ssse3.c ('k') | source/libvpx/vpx_mem/vpx_mem.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vpx_mem/vpx_mem.h
diff --git a/source/libvpx/vpx_mem/vpx_mem.h b/source/libvpx/vpx_mem/vpx_mem.h
index a027714a01b702da27b99c307866d026b4be8857..a006e0f00b3b2e2d62082f2fa469eff3d3619789 100644
--- a/source/libvpx/vpx_mem/vpx_mem.h
+++ b/source/libvpx/vpx_mem/vpx_mem.h
@@ -30,7 +30,7 @@ extern "C" {
void *vpx_realloc(void *memblk, size_t size);
void vpx_free(void *memblk);
-#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
+#if CONFIG_VP9_HIGHBITDEPTH
void *vpx_memset16(void *dest, int val, size_t length);
#endif
« no previous file with comments | « source/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c ('k') | source/libvpx/vpx_mem/vpx_mem.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698