diff options
author | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:10 -0500 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:11 -0500 |
commit | 4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9 (patch) | |
tree | 0f2ef2149af110a2ba2b581b7d498eb9b3f6e9ab /vp8/encoder/pickinter.h | |
parent | 129311689577edc570ee89049ce4f4867a87df24 (diff) | |
parent | b2ae57f1b6cbbf018d356528bd8e816752dbbfb7 (diff) | |
download | libvpx-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/pickinter.h')
-rw-r--r-- | vp8/encoder/pickinter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/pickinter.h b/vp8/encoder/pickinter.h index b80e4c86f..af060d701 100644 --- a/vp8/encoder/pickinter.h +++ b/vp8/encoder/pickinter.h @@ -12,7 +12,7 @@ #ifndef __INC_PICKINTER_H #define __INC_PICKINTER_H #include "vpx_ports/config.h" -#include "onyxc_int.h" +#include "vp8/common/onyxc_int.h" #define RD_ESTIMATE(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) ) extern int vp8_pick_intra4x4mby_modes(const VP8_ENCODER_RTCD *, MACROBLOCK *mb, int *Rate, int *Distortion); |