summaryrefslogtreecommitdiff
path: root/vp8/encoder/arm/quantize_arm.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/encoder/arm/quantize_arm.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/encoder/arm/quantize_arm.c')
-rw-r--r--vp8/encoder/arm/quantize_arm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/arm/quantize_arm.c b/vp8/encoder/arm/quantize_arm.c
index 225feaca6..75ec205cc 100644
--- a/vp8/encoder/arm/quantize_arm.c
+++ b/vp8/encoder/arm/quantize_arm.c
@@ -12,9 +12,9 @@
#include <math.h>
#include "vpx_mem/vpx_mem.h"
-#include "quantize.h"
-#include "entropy.h"
-#include "predictdc.h"
+#include "vp8/encoder/quantize.h"
+#include "vp8/common/entropy.h"
+#include "vp8/common/predictdc.h"
DECLARE_ALIGNED(16, const short, vp8_rvsplus1_default_zig_zag1d[16]) =
{