Commit 46c71e5e authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Remove duplicate declaration"

parents 1231638d 7ef16efc
...@@ -94,6 +94,12 @@ typedef enum { ...@@ -94,6 +94,12 @@ typedef enum {
SRGB = 7 // RGB SRGB = 7 // RGB
} COLOR_SPACE; } COLOR_SPACE;
typedef enum {
VP9_LAST_FLAG = 1 << 0,
VP9_GOLD_FLAG = 1 << 1,
VP9_ALT_FLAG = 1 << 2,
} VP9_REFFRAME;
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
......
...@@ -37,12 +37,6 @@ typedef struct { ...@@ -37,12 +37,6 @@ typedef struct {
int input_partition; int input_partition;
} VP9D_CONFIG; } VP9D_CONFIG;
typedef enum {
VP9_LAST_FLAG = 1,
VP9_GOLD_FLAG = 2,
VP9_ALT_FLAG = 4
} VP9_REFFRAME;
typedef struct VP9Decompressor { typedef struct VP9Decompressor {
DECLARE_ALIGNED(16, MACROBLOCKD, mb); DECLARE_ALIGNED(16, MACROBLOCKD, mb);
......
...@@ -418,12 +418,6 @@ typedef enum { ...@@ -418,12 +418,6 @@ typedef enum {
ONETWO = 3 ONETWO = 3
} VPX_SCALING; } VPX_SCALING;
typedef enum {
VP9_LAST_FLAG = 1 << 0,
VP9_GOLD_FLAG = 1 << 1,
VP9_ALT_FLAG = 1 << 2,
} VP9_REFFRAME;
typedef enum { typedef enum {
USAGE_LOCAL_FILE_PLAYBACK = 0, USAGE_LOCAL_FILE_PLAYBACK = 0,
USAGE_STREAM_FROM_SERVER = 1, USAGE_STREAM_FROM_SERVER = 1,
......
Supports Markdown
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