Merge "dct32x32_test: create fn pointers w/'&' ref"

[libvpx] / tools_common.h

diff --git a/tools_common.h b/tools_common.h
index adccec88bb34743f10de51c60caa81f03660dcdb..98347b6f27150f6d9fe5f50bfd72ae68e8459fea 100644 (file)
--- a/tools_common.h
+++ b/tools_common.h
@@ -62,6 +62,7 @@
 
 #define VP8_FOURCC 0x30385056
 #define VP9_FOURCC 0x30395056
+#define VP10_FOURCC 0x303a5056
 
 enum VideoFileType {
   FILE_TYPE_RAW,
@@ -150,7 +151,7 @@ int vpx_img_read(vpx_image_t *img, FILE *file);
 
 double sse_to_psnr(double samples, double peak, double mse);
 
-#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
+#if CONFIG_VP9_HIGHBITDEPTH
 void vpx_img_upshift(vpx_image_t *dst, vpx_image_t *src, int input_shift);
 void vpx_img_downshift(vpx_image_t *dst, vpx_image_t *src, int down_shift);
 void vpx_img_truncate_16_to_8(vpx_image_t *dst, vpx_image_t *src);