From 7ef16efca12987d5df4036e110e14b4ebdce0cf8 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Wed, 19 Mar 2014 09:40:19 -0700 Subject: [PATCH] Remove duplicate declaration Change-Id: Ic8e52a89e0df816c38cd8ff1b7c53862b9a6dff2 --- vp9/common/vp9_enums.h | 6 ++++++ vp9/decoder/vp9_decoder.h | 6 ------ vp9/encoder/vp9_onyx_int.h | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h index e96e76947..779dce017 100644 --- a/vp9/common/vp9_enums.h +++ b/vp9/common/vp9_enums.h @@ -94,6 +94,12 @@ typedef enum { SRGB = 7 // RGB } COLOR_SPACE; +typedef enum { + VP9_LAST_FLAG = 1 << 0, + VP9_GOLD_FLAG = 1 << 1, + VP9_ALT_FLAG = 1 << 2, +} VP9_REFFRAME; + #ifdef __cplusplus } // extern "C" #endif diff --git a/vp9/decoder/vp9_decoder.h b/vp9/decoder/vp9_decoder.h index 4cbff4516..39cd86e84 100644 --- a/vp9/decoder/vp9_decoder.h +++ b/vp9/decoder/vp9_decoder.h @@ -37,12 +37,6 @@ typedef struct { int input_partition; } VP9D_CONFIG; -typedef enum { - VP9_LAST_FLAG = 1, - VP9_GOLD_FLAG = 2, - VP9_ALT_FLAG = 4 -} VP9_REFFRAME; - typedef struct VP9Decompressor { DECLARE_ALIGNED(16, MACROBLOCKD, mb); diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 9925e5f19..1f492c751 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -411,12 +411,6 @@ typedef enum { ONETWO = 3 } VPX_SCALING; -typedef enum { - VP9_LAST_FLAG = 1 << 0, - VP9_GOLD_FLAG = 1 << 1, - VP9_ALT_FLAG = 1 << 2, -} VP9_REFFRAME; - typedef enum { USAGE_LOCAL_FILE_PLAYBACK = 0, USAGE_STREAM_FROM_SERVER = 1, -- 2.50.1