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

Unified Diff: source/libvpx/vp9/common/vp9_sadmxn.h

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 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/vp9/common/vp9_rtcd_defs.sh ('k') | source/libvpx/vp9/common/vp9_seg_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp9/common/vp9_sadmxn.h
===================================================================
--- source/libvpx/vp9/common/vp9_sadmxn.h (revision 177019)
+++ source/libvpx/vp9/common/vp9_sadmxn.h (working copy)
@@ -11,14 +11,14 @@
#ifndef VP9_COMMON_VP9_SADMXN_H_
#define VP9_COMMON_VP9_SADMXN_H_
-static __inline
-unsigned int sad_mx_n_c(
- const unsigned char *src_ptr,
- int src_stride,
- const unsigned char *ref_ptr,
- int ref_stride,
- int m,
- int n) {
+#include "vpx/vpx_integer.h"
+
+static __inline unsigned int sad_mx_n_c(const uint8_t *src_ptr,
+ int src_stride,
+ const uint8_t *ref_ptr,
+ int ref_stride,
+ int m,
+ int n) {
int r, c;
unsigned int sad = 0;
@@ -34,4 +34,4 @@
return sad;
}
-#endif
+#endif // VP9_COMMON_VP9_SADMXN_H_
« no previous file with comments | « source/libvpx/vp9/common/vp9_rtcd_defs.sh ('k') | source/libvpx/vp9/common/vp9_seg_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698