Remove final semicolon from some macros

[ffmpeg] / libavcodec / rectangle.h

diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h
index b9b2103b45b335f7a05d0d611b46176e8a187073..cf4a9ccec39d615f95244e22677fae2d40e8a313 100644 (file)
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavcodec/rectangle.h
+ * @file
  * useful rectangle filling function
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
@@ -37,11 +37,11 @@
  * fill a rectangle.
  * @param h height of the rectangle, should be a constant
  * @param w width of the rectangle, should be a constant
- * @param size the size of val (1 or 4), should be a constant
+ * @param size the size of val (1, 2 or 4), should be a constant
  */
 static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){
     uint8_t *p= (uint8_t*)vp;
-    assert(size==1 || size==4);
+    assert(size==1 || size==2 || size==4);
     assert(w<=4);
 
     w      *= size;
@@ -87,7 +87,7 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride,
         *(uint64_t*)(p + 0+3*stride)= v;
         *(uint64_t*)(p + 8+3*stride)= v;
 #else
-        const uint32_t v= size==2 ? val*0x00010001 : val*0x01010101;
+        const uint32_t v= size==2 ? val*0x00010001 : val;
         *(uint32_t*)(p + 0+0*stride)= v;
         *(uint32_t*)(p + 4+0*stride)= v;
         if(h==1) return;
@@ -99,23 +99,23 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride,
         *(uint32_t*)(p + 0+3*stride)= v;
         *(uint32_t*)(p + 4+3*stride)= v;
     }else if(w==16){
-        *(uint32_t*)(p + 0+0*stride)= v;
-        *(uint32_t*)(p + 4+0*stride)= v;
-        *(uint32_t*)(p + 8+0*stride)= v;
-        *(uint32_t*)(p +12+0*stride)= v;
-        *(uint32_t*)(p + 0+1*stride)= v;
-        *(uint32_t*)(p + 4+1*stride)= v;
-        *(uint32_t*)(p + 8+1*stride)= v;
-        *(uint32_t*)(p +12+1*stride)= v;
+        *(uint32_t*)(p + 0+0*stride)= val;
+        *(uint32_t*)(p + 4+0*stride)= val;
+        *(uint32_t*)(p + 8+0*stride)= val;
+        *(uint32_t*)(p +12+0*stride)= val;
+        *(uint32_t*)(p + 0+1*stride)= val;
+        *(uint32_t*)(p + 4+1*stride)= val;
+        *(uint32_t*)(p + 8+1*stride)= val;
+        *(uint32_t*)(p +12+1*stride)= val;
         if(h==2) return;
-        *(uint32_t*)(p + 0+2*stride)= v;
-        *(uint32_t*)(p + 4+2*stride)= v;
-        *(uint32_t*)(p + 8+2*stride)= v;
-        *(uint32_t*)(p +12+2*stride)= v;
-        *(uint32_t*)(p + 0+3*stride)= v;
-        *(uint32_t*)(p + 4+3*stride)= v;
-        *(uint32_t*)(p + 8+3*stride)= v;
-        *(uint32_t*)(p +12+3*stride)= v;
+        *(uint32_t*)(p + 0+2*stride)= val;
+        *(uint32_t*)(p + 4+2*stride)= val;
+        *(uint32_t*)(p + 8+2*stride)= val;
+        *(uint32_t*)(p +12+2*stride)= val;
+        *(uint32_t*)(p + 0+3*stride)= val;
+        *(uint32_t*)(p + 4+3*stride)= val;
+        *(uint32_t*)(p + 8+3*stride)= val;
+        *(uint32_t*)(p +12+3*stride)= val;
 #endif
     }else
         assert(0);