diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-11-08 17:09:30 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-11-15 10:46:17 -0800 |
| commit | a9c7597adcc3734e3528d4fbadf6332043cb4e44 (patch) | |
| tree | daa512489a70b39a0ab1813853bfc0451016328b /vp8/decoder | |
| parent | b72373de79800e801ce730d24cb115daf78ae660 (diff) | |
| download | libvpx-a9c7597adcc3734e3528d4fbadf6332043cb4e44.tar libvpx-a9c7597adcc3734e3528d4fbadf6332043cb4e44.tar.gz libvpx-a9c7597adcc3734e3528d4fbadf6332043cb4e44.tar.bz2 libvpx-a9c7597adcc3734e3528d4fbadf6332043cb4e44.zip | |
support building vp8 and vp9 into a single lib
Change-Id: Ib8f8a66c9fd31e508cdc9caa662192f38433aa3d
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/decodframe.c | 3 | ||||
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 1 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index a4a00f6bf..a22f37246 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -10,7 +10,8 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" +#include "./vpx_scale_rtcd.h" #include "onyxd_int.h" #include "vp8/common/header.h" #include "vp8/common/reconintra4x4.h" diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 8d6871b3d..459e34e06 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -25,6 +25,7 @@ #include <assert.h> #include "vp8/common/quant_common.h" +#include "./vpx_scale_rtcd.h" #include "vpx_scale/vpxscale.h" #include "vp8/common/systemdependent.h" #include "vpx_ports/vpx_timer.h" diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index e52a707c0..a714856b0 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #if !defined(WIN32) && CONFIG_OS_SUPPORT == 1 # include <unistd.h> #endif |