summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/auxiliary/vl/vp8/common/treecoder.c10
-rw-r--r--src/gallium/auxiliary/vl/vp8/decoder/decodemv.c4
-rw-r--r--src/gallium/auxiliary/vl/vp8/vp8_mem.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/vl/vp8/common/treecoder.c b/src/gallium/auxiliary/vl/vp8/common/treecoder.c
index c026bef16f..37039b74b2 100644
--- a/src/gallium/auxiliary/vl/vp8/common/treecoder.c
+++ b/src/gallium/auxiliary/vl/vp8/common/treecoder.c
@@ -9,7 +9,7 @@
*/
-#if CONFIG_DEBUG
+#if ENABLE_DEBUG
#include <assert.h>
#endif
#include <stdio.h>
@@ -55,7 +55,7 @@ static void branch_counts(int n, /* n = size of alphabet */
const int tree_len = n - 1;
int t = 0;
-#if CONFIG_DEBUG
+#if ENABLE_DEBUG
assert(tree_len);
#endif
@@ -79,7 +79,7 @@ static void branch_counts(int n, /* n = size of alphabet */
{
const int b = (enc >> --L) & 1;
const int j = i >> 1;
-#if CONFIG_DEBUG
+#if ENABLE_DEBUG
assert(j < tree_len && 0 <= L);
#endif
branch_ct [j] [b] += ct;
@@ -87,7 +87,7 @@ static void branch_counts(int n, /* n = size of alphabet */
}
while (i > 0);
-#if CONFIG_DEBUG
+#if ENABLE_DEBUG
assert(!L);
#endif
}
@@ -114,7 +114,7 @@ void vp8_tree_probs_from_distribution(int n, /* n = size of alphabet */
const unsigned int *const c = branch_ct[t];
const unsigned int tot = c[0] + c[1];
-#if CONFIG_DEBUG
+#if ENABLE_DEBUG
assert(tot < (1 << 24)); /* no overflow below */
#endif
diff --git a/src/gallium/auxiliary/vl/vp8/decoder/decodemv.c b/src/gallium/auxiliary/vl/vp8/decoder/decodemv.c
index df356dddbf..7825005f71 100644
--- a/src/gallium/auxiliary/vl/vp8/decoder/decodemv.c
+++ b/src/gallium/auxiliary/vl/vp8/decoder/decodemv.c
@@ -15,7 +15,7 @@
#include "onyxd_int.h"
#include "../common/findnearmv.h"
-#if CONFIG_DEBUG
+#if ENABLE_DEBUG
#include <assert.h>
#endif
static int vp8_read_bmode(vp8_reader *bc, const vp8_prob *p)
@@ -401,7 +401,7 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
break;
default:;
- #if CONFIG_DEBUG
+ #if ENABLE_DEBUG
assert(0);
#endif
}
diff --git a/src/gallium/auxiliary/vl/vp8/vp8_mem.h b/src/gallium/auxiliary/vl/vp8/vp8_mem.h
index 55145197e2..2c7118f9f8 100644
--- a/src/gallium/auxiliary/vl/vp8/vp8_mem.h
+++ b/src/gallium/auxiliary/vl/vp8/vp8_mem.h
@@ -35,7 +35,7 @@ extern "C" {
#define DECLARE_ALIGNED(n,typ,val) typ val
#endif
-#if CONFIG_DEBUG
+#if ENABLE_DEBUG
#define CHECK_MEM_ERROR(lval,expr) do { \
lval = (expr); \
if (!lval) \
@@ -50,7 +50,7 @@ extern "C" {
vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR, \
"Failed to allocate "#lval); \
} while(0)
-#endif /* CONFIG_DEBUG */
+#endif /* ENABLE_DEBUG */
void *vpx_memalign(size_t align, size_t size);
void *vpx_malloc(size_t size);