summaryrefslogtreecommitdiff
path: root/vp8/encoder/quantize.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/quantize.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/quantize.c')
-rw-r--r--vp8/encoder/quantize.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c
index 4a2329fc1..02b9d7bd9 100644
--- a/vp8/encoder/quantize.c
+++ b/vp8/encoder/quantize.c
@@ -13,8 +13,8 @@
#include "vpx_mem/vpx_mem.h"
#include "quantize.h"
-#include "entropy.h"
-#include "predictdc.h"
+#include "vp8/common/entropy.h"
+#include "vp8/common/predictdc.h"
#define EXACT_QUANT