From fd85664ae67e9ae6d309cf6d229ce39c217e92fd Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 19 Jul 2016 20:51:25 -0700
Subject: [PATCH] vp8/{bitstream,rdopt},y4minput: correct break placement

these should be placed within {}s when present

Change-Id: If00e9766fa8cb039cc070467f353a468f99460fb
---
 vp8/encoder/bitstream.c |  3 ++-
 vp8/encoder/rdopt.c     |  9 ++++++---
 y4minput.c              | 24 ++++++++++++++++--------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 0a0ecbb9c..6bd347887 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -584,7 +584,8 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) {
                 write_mv(w, &blockmv.as_mv, &best_mv, (const MV_CONTEXT *)mvc);
               }
             } while (++j < cpi->mb.partition_info->count);
-          } break;
+            break;
+          }
           default: break;
         }
       }
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 8ba32e0e2..bba4fa8ea 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -1949,7 +1949,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
           this_rd = INT_MAX;
           disable_skip = 1;
         }
-      } break;
+        break;
+      }
 
       case SPLITMV: {
         int tmp_rd;
@@ -1983,7 +1984,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
           this_rd = INT_MAX;
           disable_skip = 1;
         }
-      } break;
+        break;
+      }
       case DC_PRED:
       case V_PRED:
       case H_PRED:
@@ -2004,7 +2006,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
         rd.rate_uv = uv_intra_rate_tokenonly;
         rd.distortion2 += uv_intra_distortion;
         rd.distortion_uv = uv_intra_distortion;
-      } break;
+        break;
+      }
 
       case NEWMV: {
         int thissme;
diff --git a/y4minput.c b/y4minput.c
index 7de859f7a..acf7d69fe 100644
--- a/y4minput.c
+++ b/y4minput.c
@@ -73,33 +73,39 @@ static int y4m_parse_tags(y4m_input *_y4m, char *_tags) {
       case 'W': {
         if (sscanf(p + 1, "%d", &_y4m->pic_w) != 1) return -1;
         got_w = 1;
-      } break;
+        break;
+      }
       case 'H': {
         if (sscanf(p + 1, "%d", &_y4m->pic_h) != 1) return -1;
         got_h = 1;
-      } break;
+        break;
+      }
       case 'F': {
         if (sscanf(p + 1, "%d:%d", &_y4m->fps_n, &_y4m->fps_d) != 2) {
           return -1;
         }
         got_fps = 1;
-      } break;
+        break;
+      }
       case 'I': {
         _y4m->interlace = p[1];
         got_interlace = 1;
-      } break;
+        break;
+      }
       case 'A': {
         if (sscanf(p + 1, "%d:%d", &_y4m->par_n, &_y4m->par_d) != 2) {
           return -1;
         }
         got_par = 1;
-      } break;
+        break;
+      }
       case 'C': {
         if (q - p > 16) return -1;
         memcpy(_y4m->chroma_type, p + 1, q - p - 1);
         _y4m->chroma_type[q - p - 1] = '\0';
         got_chroma = 1;
-      } break;
+        break;
+      }
         /*Ignore unknown tags.*/
     }
   }
@@ -337,7 +343,8 @@ static void y4m_convert_42xpaldv_42xjpeg(y4m_input *_y4m, unsigned char *_dst,
         }
         _dst += c_sz - c_w;
         tmp -= c_w;
-      } break;
+        break;
+      }
       case 2: {
         /*Slide C_r down a quarter-pel.
           This is the same as the horizontal filter.*/
@@ -373,7 +380,8 @@ static void y4m_convert_42xpaldv_42xjpeg(y4m_input *_y4m, unsigned char *_dst,
           _dst++;
           tmp++;
         }
-      } break;
+        break;
+      }
     }
     /*For actual interlaced material, this would have to be done separately on
        each field, and the shift amounts would be different.