Merge "Fix external resize memory issues."

[libvpx] / vpx_scale / vpx_scale.h

diff --git a/vpx_scale/vpx_scale.h b/vpx_scale/vpx_scale.h
index 308b6aab6854581d30910ad5c907ef74aca2ffc2..43fcf9d66e18fbc8e87d1a2239b8bd2ec813e6da 100644 (file)
--- a/vpx_scale/vpx_scale.h
+++ b/vpx_scale/vpx_scale.h
@@ -9,12 +9,12 @@
  */
 
 
-#ifndef VPXSCALE_H
-#define VPXSCALE_H
+#ifndef VPX_SCALE_VPX_SCALE_H_
+#define VPX_SCALE_VPX_SCALE_H_
 
 #include "vpx_scale/yv12config.h"
 
-extern void vp8_scale_frame(YV12_BUFFER_CONFIG *src,
+extern void vpx_scale_frame(YV12_BUFFER_CONFIG *src,
                             YV12_BUFFER_CONFIG *dst,
                             unsigned char *temp_area,
                             unsigned char temp_height,
@@ -24,4 +24,4 @@ extern void vp8_scale_frame(YV12_BUFFER_CONFIG *src,
                             unsigned int vratio,
                             unsigned int interlaced);
 
-#endif
+#endif  // VPX_SCALE_VPX_SCALE_H_