diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-01-08 10:11:26 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-01-08 10:19:59 -0800 |
| commit | 879cb7d96259a71eea0038452a00241650589084 (patch) | |
| tree | 4d8c0a86fcdb6655d10647837e6c3adfb38639c4 /vpx_mem | |
| parent | c14439c3d3db8dfa44a30c4edc50f56250ce4cd3 (diff) | |
| parent | bdca030cafc31446afc1685906f7c44e1850ed84 (diff) | |
| download | libvpx-879cb7d96259a71eea0038452a00241650589084.tar libvpx-879cb7d96259a71eea0038452a00241650589084.tar.gz libvpx-879cb7d96259a71eea0038452a00241650589084.tar.bz2 libvpx-879cb7d96259a71eea0038452a00241650589084.zip | |
Merge vp9-preview changes into experimental branch
Incorportate vp9-preview changes by merging master branch into experimental.
Conflicts:
test/test.mk
vp9/common/vp9_filter.c
vp9/common/vp9_idctllm.c
vp9/common/vp9_invtrans.h
vp9/common/vp9_mbpitch.c
vp9/common/vp9_rtcd_defs.sh
vp9/common/vp9_systemdependent.h
vp9/common/vp9_type_aliases.h
vp9/common/x86/vp9_asm_stubs.c
vp9/common/x86/vp9_subpixel_mmx.asm
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_dequantize.c
vp9/decoder/vp9_dequantize.h
vp9/decoder/vp9_onyxd_int.h
vp9/encoder/vp9_bitstream.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_rdopt.c
Change-Id: I17f51c3666d1b59cf1a699f87607cbc5d30a87c5
Diffstat (limited to 'vpx_mem')
| -rw-r--r-- | vpx_mem/include/vpx_mem_intrnl.h | 2 | ||||
| -rw-r--r-- | vpx_mem/vpx_mem_tracker.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vpx_mem/include/vpx_mem_intrnl.h b/vpx_mem/include/vpx_mem_intrnl.h index 0f58cfc8f..60b5165f3 100644 --- a/vpx_mem/include/vpx_mem_intrnl.h +++ b/vpx_mem/include/vpx_mem_intrnl.h @@ -11,7 +11,7 @@ #ifndef __VPX_MEM_INTRNL_H__ #define __VPX_MEM_INTRNL_H__ -#include "vpx_ports/config.h" +#include "./vpx_config.h" #ifndef CONFIG_MEM_MANAGER # if defined(VXWORKS) diff --git a/vpx_mem/vpx_mem_tracker.c b/vpx_mem/vpx_mem_tracker.c index 5b2103b55..613e8a16b 100644 --- a/vpx_mem/vpx_mem_tracker.c +++ b/vpx_mem/vpx_mem_tracker.c @@ -22,7 +22,7 @@ in the memory_tracker struct as well as calls to create/destroy/lock/unlock the mutex in vpx_memory_tracker_init/Destroy and memory_tracker_lock_mutex/unlock_mutex */ -#include "vpx_ports/config.h" +#include "./vpx_config.h" #if defined(__uClinux__) # include <lddk.h> |