summaryrefslogtreecommitdiff
path: root/vp8/encoder/boolhuff.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-02-18 00:05:10 -0500
committerJohn Koleszar <jkoleszar@google.com>2011-02-18 00:05:11 -0500
commit4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9 (patch)
tree0f2ef2149af110a2ba2b581b7d498eb9b3f6e9ab /vp8/encoder/boolhuff.c
parent129311689577edc570ee89049ce4f4867a87df24 (diff)
parentb2ae57f1b6cbbf018d356528bd8e816752dbbfb7 (diff)
downloadlibvpx-4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9.tar
libvpx-4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9.tar.gz
libvpx-4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9.tar.bz2
libvpx-4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9.zip
Merge remote branch 'origin/master' into experimental
Change-Id: I8999a33db82d38eb85482f3c423db238d6ee3ed9
Diffstat (limited to 'vp8/encoder/boolhuff.c')
-rw-r--r--vp8/encoder/boolhuff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/boolhuff.c b/vp8/encoder/boolhuff.c
index 82006b196..788d2b05f 100644
--- a/vp8/encoder/boolhuff.c
+++ b/vp8/encoder/boolhuff.c
@@ -10,7 +10,7 @@
#include "boolhuff.h"
-#include "blockd.h"
+#include "vp8/common/blockd.h"