summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Duvivier <cduvivier@google.com>2012-08-14 14:12:00 -0700
committerChristian Duvivier <cduvivier@google.com>2012-08-14 16:23:32 -0700
commita1168155a748c752b8b19cb539013d8f3cee2fd5 (patch)
tree8c139b38161b1b4f1f6c55dd45b9a1549853a009
parent73089031f052228e60233c15c94df822b0c84556 (diff)
downloadlibvpx-a1168155a748c752b8b19cb539013d8f3cee2fd5.tar.gz
Fix warnings.
Change-Id: I4b911e4173da30c164bde7ea50bc80a70fbbb745
-rwxr-xr-xconfigure1
-rw-r--r--examples/decoder_tmpl.c1
-rw-r--r--vp8/common/predict_rotated.c2
-rw-r--r--vp8/common/treecoder.c2
-rw-r--r--vpx_mem/vpx_mem.h1
-rw-r--r--vpx_ports/asm_offsets.h2
-rw-r--r--vpxenc.c1
7 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index b39ddb2b8..6af0d6cac 100755
--- a/configure
+++ b/configure
@@ -226,6 +226,7 @@ EXPERIMENT_LIST="
switchable_interp
tx16x16
newbestrefmv
+ rotation
"
CONFIG_LIST="
external_build
diff --git a/examples/decoder_tmpl.c b/examples/decoder_tmpl.c
index 8194f0ade..597fea200 100644
--- a/examples/decoder_tmpl.c
+++ b/examples/decoder_tmpl.c
@@ -12,6 +12,7 @@
/*
@*INTRODUCTION
*/
+#include "vpx_config.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/vp8/common/predict_rotated.c b/vp8/common/predict_rotated.c
index 29ef65cea..140189617 100644
--- a/vp8/common/predict_rotated.c
+++ b/vp8/common/predict_rotated.c
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "vpx_config.h"
+
#if CONFIG_ROTATION
typedef struct {
int y;
diff --git a/vp8/common/treecoder.c b/vp8/common/treecoder.c
index 5c182d4dd..def4caa04 100644
--- a/vp8/common/treecoder.c
+++ b/vp8/common/treecoder.c
@@ -11,7 +11,7 @@
#include "vpx_config.h"
-#if CONFIG_DEBUG
+#if defined(CONFIG_DEBUG) && CONFIG_DEBUG
#include <assert.h>
#endif
#include <stdio.h>
diff --git a/vpx_mem/vpx_mem.h b/vpx_mem/vpx_mem.h
index 6ee5f5d7e..3246e9298 100644
--- a/vpx_mem/vpx_mem.h
+++ b/vpx_mem/vpx_mem.h
@@ -12,6 +12,7 @@
#ifndef __VPX_MEM_H__
#define __VPX_MEM_H__
+#include "vpx_config.h"
#if defined(__uClinux__)
# include <lddk.h>
#endif
diff --git a/vpx_ports/asm_offsets.h b/vpx_ports/asm_offsets.h
index 05da24f2b..6752463b2 100644
--- a/vpx_ports/asm_offsets.h
+++ b/vpx_ports/asm_offsets.h
@@ -18,7 +18,7 @@
static void assert_##name(void) UNUSED;\
static void assert_##name(void) {switch(0){case 0:case !!(cond):;}}
-#if INLINE_ASM
+#if defined(INLINE_ASM) && INLINE_ASM
#define DEFINE(sym, val) asm("\n" #sym " EQU %0" : : "i" (val));
#define BEGIN int main(void) {
#define END return 0; }
diff --git a/vpxenc.c b/vpxenc.c
index 5667abe1c..26c52d51c 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "vpx_config.h"
/* This is a simple program that encodes YV12 files and generates ivf
* files using the new interface.