shithub: libvpx

Download patch

ref: e2d73897d04708a86a8dd3c5559a07fb609bddde
parent: 6e161a26e3c59fe4a01778d55ba54b4f504b5893
parent: de5cb8b1406d03deed65dddeeb6f30e1aa5d1c37
author: Jim Bankoski <[email protected]>
date: Fri Oct 4 12:42:06 EDT 2013 

Merge "vp9_encodeframe.c cpplint issues resolved"


--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -173,8 +173,9 @@
           tmp = sortlist[j - 1];
           sortlist[j - 1] = sortlist[j];
           sortlist[j] = tmp;
-        } else
-        break;
+        } else {
+          break;
+        }
       }
     }
 
@@ -246,13 +247,11 @@
 #if OUTPUT_NORM_ACT_STATS
     fprintf(f, "\n");
 #endif
-
   }
 
 #if OUTPUT_NORM_ACT_STATS
   fclose(f);
 #endif
-
 }
 #endif  // USE_ACT_INDEX
 
@@ -317,7 +316,6 @@
   // Calculate an activity index number of each mb
   calc_activity_index(cpi, x);
 #endif
-
 }
 
 // Macroblock activity masking
@@ -684,7 +682,7 @@
       return &x->ab4x4_context[xd->sb_index][xd->mb_index][xd->b_index];
     default:
       assert(0);
-      return NULL ;
+      return NULL;
   }
 }
 
@@ -701,7 +699,7 @@
       return &x->b_partitioning[xd->sb_index][xd->mb_index][xd->b_index];
     default:
       assert(0);
-      return NULL ;
+      return NULL;
   }
 }
 
@@ -2012,7 +2010,6 @@
   // Keep record of the total distortion this time around for future use
   cpi->last_frame_distortion = cpi->frame_distortion;
 #endif
-
 }
 
 static int check_dual_ref_flags(VP9_COMP *cpi) {