From 22ae1403e99e417dac4f6432915d852c824a94c9 Mon Sep 17 00:00:00 2001
From: "Timothy B. Terriberry" <tterribe@xiph.org>
Date: Wed, 2 May 2012 10:08:10 -0700
Subject: [PATCH] Fix trailing commas in enums.

These are warnings in most builds, but show up as compile errors on
 some platforms when these headers are included from C++ code.

Change-Id: I6c523b4dbbc699075fe73830442b51922e5a61d5
---
 vp8/common/onyx.h      | 4 ++--
 vp8/encoder/onyx_int.h | 2 +-
 vpx/vp8.h              | 4 ++--
 vpx/vp8cx.h            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/vp8/common/onyx.h b/vp8/common/onyx.h
index 4c39b49f0..500dff0b0 100644
--- a/vp8/common/onyx.h
+++ b/vp8/common/onyx.h
@@ -60,14 +60,14 @@ extern "C"
         MODE_BESTQUALITY    = 0x2,
         MODE_FIRSTPASS      = 0x3,
         MODE_SECONDPASS     = 0x4,
-        MODE_SECONDPASS_BEST = 0x5,
+        MODE_SECONDPASS_BEST = 0x5
     } MODE;
 
     typedef enum
     {
         FRAMEFLAGS_KEY    = 1,
         FRAMEFLAGS_GOLDEN = 2,
-        FRAMEFLAGS_ALTREF = 4,
+        FRAMEFLAGS_ALTREF = 4
     } FRAMETYPE_FLAGS;
 
 
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index ea5980146..d5d41301a 100644
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -164,7 +164,7 @@ typedef enum
     THR_SPLIT2         = 17,
     THR_SPLIT3         = 18,
 
-    THR_B_PRED         = 19,
+    THR_B_PRED         = 19
 }
 THR_MODES;
 
diff --git a/vpx/vp8.h b/vpx/vp8.h
index eec979763..393b16194 100644
--- a/vpx/vp8.h
+++ b/vpx/vp8.h
@@ -46,7 +46,7 @@ enum vp8_com_control_id
     VP8_SET_DBG_COLOR_B_MODES   = 6,    /**< set which blocks modes to color */
     VP8_SET_DBG_DISPLAY_MV      = 7,    /**< set which motion vector modes to draw */
     VP8_COMMON_CTRL_ID_MAX,
-    VP8_DECODER_CTRL_ID_START   = 256,
+    VP8_DECODER_CTRL_ID_START   = 256
 };
 
 /*!\brief post process flags
@@ -63,7 +63,7 @@ enum vp8_postproc_level
     VP8_DEBUG_TXT_MBLK_MODES    = 1<<4, /**< print macro block modes over each macro block */
     VP8_DEBUG_TXT_DC_DIFF       = 1<<5, /**< print dc diff for each macro block */
     VP8_DEBUG_TXT_RATE_INFO     = 1<<6, /**< print video rate info (encoder only) */
-    VP8_MFQE                    = 1<<10,
+    VP8_MFQE                    = 1<<10
 };
 
 /*!\brief post process flags
diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h
index 52752832c..0af631c3a 100644
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -177,7 +177,7 @@ enum vp8e_enc_control_id
      * to a keyframe, set this to 450.
      *
      */
-    VP8E_SET_MAX_INTRA_BITRATE_PCT,
+    VP8E_SET_MAX_INTRA_BITRATE_PCT
 };
 
 /*!\brief vpx 1-D scaling mode
@@ -258,7 +258,7 @@ typedef enum
     VP8_ONE_TOKENPARTITION   = 0,
     VP8_TWO_TOKENPARTITION   = 1,
     VP8_FOUR_TOKENPARTITION  = 2,
-    VP8_EIGHT_TOKENPARTITION = 3,
+    VP8_EIGHT_TOKENPARTITION = 3
 } vp8e_token_partitions;