Commit e5759773 authored by Jean-Marc Valin's avatar Jean-Marc Valin Committed by Jean-Marc Valin
Browse files

Avoid having to include cdef.h from onyxc_int.h

Avoids having to forward declare AV1_COMMON which was causing problems.

Change-Id: Iab90e6b5683a737feeec0574e31cf4bd3e02a776
parent 1df427ef
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#ifndef AV1_COMMON_DERING_H_ #ifndef AV1_COMMON_DERING_H_
#define AV1_COMMON_DERING_H_ #define AV1_COMMON_DERING_H_
#define CDEF_MAX_STRENGTHS 16
#define CDEF_STRENGTH_BITS 7 #define CDEF_STRENGTH_BITS 7
#define DERING_STRENGTHS 21 #define DERING_STRENGTHS 21
......
...@@ -35,15 +35,12 @@ ...@@ -35,15 +35,12 @@
#if CONFIG_PVQ #if CONFIG_PVQ
#include "av1/common/pvq.h" #include "av1/common/pvq.h"
#endif #endif
#if CONFIG_CDEF
struct AV1Common;
typedef struct AV1Common AV1_COMMON;
#include "av1/common/cdef.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define CDEF_MAX_STRENGTHS 16
#define REF_FRAMES_LOG2 3 #define REF_FRAMES_LOG2 3
#define REF_FRAMES (1 << REF_FRAMES_LOG2) #define REF_FRAMES (1 << REF_FRAMES_LOG2)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment