summaryrefslogtreecommitdiff
path: root/vp8/common/arm/arm_systemdependent.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-02-18 00:05:13 -0500
committerJohn Koleszar <jkoleszar@google.com>2011-02-18 00:05:13 -0500
commitf13212b72817ec5e8ec90f8375b98d1515eab27b (patch)
treec5cb709d408e0f9ef451c78a90a213ac3165753b /vp8/common/arm/arm_systemdependent.c
parent95a86dd007ee53170a25e8406c1d09e40cdbe78a (diff)
parentb2ae57f1b6cbbf018d356528bd8e816752dbbfb7 (diff)
downloadlibvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar
libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar.gz
libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar.bz2
libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.zip
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/common/arm/arm_systemdependent.c')
-rw-r--r--vp8/common/arm/arm_systemdependent.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/vp8/common/arm/arm_systemdependent.c b/vp8/common/arm/arm_systemdependent.c
index 83921f807..69e1bdff4 100644
--- a/vp8/common/arm/arm_systemdependent.c
+++ b/vp8/common/arm/arm_systemdependent.c
@@ -11,13 +11,13 @@
#include "vpx_ports/config.h"
#include "vpx_ports/arm.h"
-#include "g_common.h"
-#include "pragmas.h"
-#include "subpixel.h"
-#include "loopfilter.h"
-#include "recon.h"
-#include "idct.h"
-#include "onyxc_int.h"
+#include "vp8/common/g_common.h"
+#include "vp8/common/pragmas.h"
+#include "vp8/common/subpixel.h"
+#include "vp8/common/loopfilter.h"
+#include "vp8/common/recon.h"
+#include "vp8/common/idct.h"
+#include "vp8/common/onyxc_int.h"
extern void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x);
extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x);