commit e575977311a1d8a7e4302989519dd8064e4e8c6c
author Jean-Marc Valin <jmvalin@mozilla.com> Thu Mar 23 18:46:38 2017 -0400
committer Jean-Marc Valin <jvalin@mozilla.com> Fri Mar 24 00:29:33 2017 +0000
tree d449f50386f2a3ec8cf9fcab8baa267c4d6d9489
parent 1df427eff84decce3e08a4fe26313b1b05c3e0c4

Avoid having to include cdef.h from onyxc_int.h

Avoids having to forward declare AV1_COMMON which was causing problems.

Change-Id: Iab90e6b5683a737feeec0574e31cf4bd3e02a776

av1/common/cdef.h

diff --git a/av1/common/cdef.h b/av1/common/cdef.h
index e1944cf..1131b27 100644
--- a/av1/common/cdef.h
+++ b/av1/common/cdef.h
@@ -11,7 +11,6 @@
 #ifndef AV1_COMMON_DERING_H_
 #define AV1_COMMON_DERING_H_
 
-#define CDEF_MAX_STRENGTHS 16
 #define CDEF_STRENGTH_BITS 7
 
 #define DERING_STRENGTHS 21

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 64f9a6e..7caeb1c 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -35,15 +35,12 @@
 #if CONFIG_PVQ
 #include "av1/common/pvq.h"
 #endif
-#if CONFIG_CDEF
-struct AV1Common;
-typedef struct AV1Common AV1_COMMON;
-#include "av1/common/cdef.h"
-#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define CDEF_MAX_STRENGTHS 16
+
 #define REF_FRAMES_LOG2 3
 #define REF_FRAMES (1 << REF_FRAMES_LOG2)