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/encodeframe.c | |
| 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/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 1187ae606..58e36acdb 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -12,22 +12,22 @@ #include "vpx_ports/config.h" #include "encodemb.h" #include "encodemv.h" -#include "common.h" +#include "vp8/common/common.h" #include "onyx_int.h" -#include "extend.h" -#include "entropymode.h" -#include "quant_common.h" +#include "vp8/common/extend.h" +#include "vp8/common/entropymode.h" +#include "vp8/common/quant_common.h" #include "segmentation.h" -#include "setupintrarecon.h" +#include "vp8/common/setupintrarecon.h" #include "encodeintra.h" -#include "reconinter.h" +#include "vp8/common/reconinter.h" #include "rdopt.h" #include "pickinter.h" -#include "findnearmv.h" -#include "reconintra.h" +#include "vp8/common/findnearmv.h" +#include "vp8/common/reconintra.h" #include <stdio.h> #include <limits.h> -#include "subpixel.h" +#include "vp8/common/subpixel.h" #include "vpx_ports/vpx_timer.h" #if CONFIG_RUNTIME_CPU_DETECT |