shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove duplicate declaration"

--- a/vp9/common/vp9_enums.h

+++ b/vp9/common/vp9_enums.h

@@ -94,6 +94,12 @@

   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

--- a/vp9/decoder/vp9_decoder.h

+++ b/vp9/decoder/vp9_decoder.h

@@ -37,12 +37,6 @@

   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);

--- a/vp9/encoder/vp9_onyx_int.h

+++ b/vp9/encoder/vp9_onyx_int.h

@@ -419,12 +419,6 @@

 } 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,

   USAGE_CONSTRAINED_QUALITY = 2,