diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:13 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:13 -0500 |
| commit | f13212b72817ec5e8ec90f8375b98d1515eab27b (patch) | |
| tree | c5cb709d408e0f9ef451c78a90a213ac3165753b /vp8/decoder/onyxd_if.c | |
| parent | 95a86dd007ee53170a25e8406c1d09e40cdbe78a (diff) | |
| parent | b2ae57f1b6cbbf018d356528bd8e816752dbbfb7 (diff) | |
| download | libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar.gz libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar.bz2 libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/decoder/onyxd_if.c')
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 9fec3e051..0fc49ac79 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -9,25 +9,25 @@ */ -#include "onyxc_int.h" +#include "vp8/common/onyxc_int.h" #if CONFIG_POSTPROC -#include "postproc.h" +#include "vp8/common/postproc.h" #endif -#include "onyxd.h" +#include "vp8/common/onyxd.h" #include "onyxd_int.h" #include "vpx_mem/vpx_mem.h" -#include "alloccommon.h" +#include "vp8/common/alloccommon.h" #include "vpx_scale/yv12extend.h" -#include "loopfilter.h" -#include "swapyv12buffer.h" -#include "g_common.h" -#include "threading.h" +#include "vp8/common/loopfilter.h" +#include "vp8/common/swapyv12buffer.h" +#include "vp8/common/g_common.h" +#include "vp8/common/threading.h" #include "decoderthreading.h" #include <stdio.h> -#include "quant_common.h" +#include "vp8/common/quant_common.h" #include "vpx_scale/vpxscale.h" -#include "systemdependent.h" +#include "vp8/common/systemdependent.h" #include "vpx_ports/vpx_timer.h" #include "detokenize.h" #if ARCH_ARM |