shithub: libvpx

Download patch

ref: 7f63dabfe9bdcc010604af212b152a1cd2f75bdc
parent: c3591463f4d36207053f3f70217c66e61ccdf217
author: Jim Bankoski <jimbankoski@google.com>
date: Mon Aug 4 04:52:53 EDT 2014

break at the end of clauses with assert(0) to avoid gcc warning

Change-Id: I1b3c5337f018dde27dc819ab18bd081d169a91e8

--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -183,6 +183,7 @@
       break;
     default:
       assert(0 && "Invalid transform size.");
+      break;
   }
 
   return combine_entropy_contexts(above_ec, left_ec);
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -293,6 +293,7 @@
     }
     default: {
       assert(0);
+      break;
     }
   }
 }
@@ -985,6 +986,7 @@
       break;
     default:
       assert("Invalid partition type.");
+      break;
   }
 
   if (partition != PARTITION_SPLIT || bsize == BLOCK_8X8)
@@ -1412,6 +1414,7 @@
       break;
     default:
       assert("Invalid partition type.");
+      break;
   }
 
   if (partition != PARTITION_SPLIT || bsize == BLOCK_8X8)
@@ -1590,6 +1593,7 @@
       break;
     default:
       assert(0);
+      break;
   }
 
   pl = partition_plane_context(xd, mi_row, mi_col, bsize);
@@ -2952,6 +2956,7 @@
       break;
     default:
       assert("Invalid partition type.");
+      break;
   }
 
   if (bsize == BLOCK_64X64 && output_enabled) {
@@ -3028,6 +3033,7 @@
         break;
       default:
         assert(0);
+        break;
     }
   }
 }
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -348,6 +348,7 @@
       break;
     default:
       assert(0);
+      break;
   }
 }
 
@@ -394,6 +395,7 @@
       break;
     default:
       assert(0);
+      break;
   }
 }
 
@@ -444,6 +446,7 @@
       break;
     default:
       assert(0);
+      break;
   }
 }
 
@@ -521,6 +524,7 @@
       break;
     default:
       assert(0 && "Invalid transform size");
+      break;
   }
 }
 
@@ -692,6 +696,7 @@
       break;
     default:
       assert(0);
+      break;
   }
   if (*eob)
     *(args->skip) = 0;
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -2117,6 +2117,7 @@
       break;
     default:
       assert(0);
+      break;
   }
   if (cpi->use_svc && cpi->svc.number_temporal_layers == 1) {
     cpi->refresh_golden_frame = 0;
--- a/vp9/encoder/vp9_rd.c
+++ b/vp9/encoder/vp9_rd.c
@@ -357,6 +357,7 @@
       break;
     default:
       assert(0 && "Invalid transform size.");
+      break;
   }
 }
 
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2628,6 +2628,7 @@
         case NONE:
         case MAX_REF_FRAMES:
           assert(0 && "Invalid Reference frame");
+          break;
       }
     }
     if (mode_skip_mask & (1 << mode_index))
@@ -3225,6 +3226,7 @@
           case NONE:
           case MAX_REF_FRAMES:
             assert(0 && "Invalid Reference frame");
+            break;
         }
       }
       if (mode_skip_mask & (1 << ref_index))
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -297,6 +297,7 @@
     default:
       ERROR("Invalid image format. Only YV12, I420, I422, I444 images are "
             "supported.");
+      break;
   }
 
   if (img->d_w != ctx->cfg.g_w || img->d_h != ctx->cfg.g_h)
@@ -311,7 +312,7 @@
     case VPX_IMG_FMT_I420: return 12;
     case VPX_IMG_FMT_I422: return 16;
     case VPX_IMG_FMT_I444: return 24;
-    default: assert(0 && "Invalid image format");
+    default: assert(0 && "Invalid image format"); break;
   }
   return 0;
 }