Merge commit '80173c71bab3b8817c148837bdc920557018f428'

* commit '80173c71bab3b8817c148837bdc920557018f428':
  bfin: hpeldsp: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2 files changed, 62 insertions, 35 deletions

diff --git a/libavcodec/bfin/hpeldsp_bfin.c b/libavcodec/bfin/hpeldsp_bfin.c
index 5b69fb45e0..a8b48d7c11 100644
--- a/libavcodec/bfin/hpeldsp_bfin.c
+++ b/libavcodec/bfin/hpeldsp_bfin.c
@@ -28,75 +28,92 @@
 #include "libavcodec/hpeldsp.h"
 #include "hpeldsp_bfin.h"
 
-static void bfin_put_pixels8 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels8(uint8_t *block, const uint8_t *pixels,
+                             ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels8uc (block, pixels, pixels, line_size, line_size, h);
+    ff_bfin_put_pixels8uc(block, pixels, pixels, line_size, line_size, h);
 }
 
-static void bfin_put_pixels8_x2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_x2(uint8_t *block, const uint8_t *pixels,
+                                ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels8uc (block, pixels, pixels+1, line_size, line_size, h);
+    ff_bfin_put_pixels8uc(block, pixels, pixels + 1, line_size, line_size, h);
 }
 
-static void bfin_put_pixels8_y2 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_y2(uint8_t *block, const uint8_t *pixels,
+                                ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels8uc (block, pixels, pixels+line_size, line_size, line_size, h);
+    ff_bfin_put_pixels8uc(block, pixels, pixels + line_size,
+                          line_size, line_size, h);
 }
 
-static void bfin_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_xy2(uint8_t *block, const uint8_t *s0,
+                                 ptrdiff_t line_size, int h)
 {
-    ff_bfin_z_put_pixels8_xy2 (block,s0,line_size, line_size, h);
+    ff_bfin_z_put_pixels8_xy2(block, s0, line_size, line_size, h);
 }
 
-static void bfin_put_pixels16 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels16(uint8_t *block, const uint8_t *pixels,
+                              ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels16uc (block, pixels, pixels, line_size, line_size, h);
+    ff_bfin_put_pixels16uc(block, pixels, pixels, line_size, line_size, h);
 }
 
-static void bfin_put_pixels16_x2 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_x2(uint8_t *block, const uint8_t *pixels,
+                                 ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels16uc (block, pixels, pixels+1, line_size, line_size, h);
+    ff_bfin_put_pixels16uc(block, pixels, pixels + 1, line_size, line_size, h);
 }
 
-static void bfin_put_pixels16_y2 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_y2(uint8_t *block, const uint8_t *pixels,
+                                 ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels16uc (block, pixels, pixels+line_size, line_size, line_size, h);
+    ff_bfin_put_pixels16uc(block, pixels, pixels + line_size,
+                           line_size, line_size, h);
 }
 
-static void bfin_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_xy2(uint8_t *block, const uint8_t *s0,
+                                  ptrdiff_t line_size, int h)
 {
-    ff_bfin_z_put_pixels16_xy2 (block,s0,line_size, line_size, h);
+    ff_bfin_z_put_pixels16_xy2(block, s0, line_size, line_size, h);
 }
 
-static void bfin_put_pixels8_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_nornd(uint8_t *block, const uint8_t *pixels,
+                                   ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels8uc_nornd (block, pixels, pixels, line_size, h);
+    ff_bfin_put_pixels8uc_nornd(block, pixels, pixels, line_size, h);
 }
 
-static void bfin_put_pixels8_x2_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_x2_nornd(uint8_t *block, const uint8_t *pixels,
+                                      ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+1, line_size, h);
+    ff_bfin_put_pixels8uc_nornd(block, pixels, pixels + 1, line_size, h);
 }
 
-static void bfin_put_pixels8_y2_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_y2_nornd(uint8_t *block, const uint8_t *pixels,
+                                      ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+line_size, line_size, h);
+    ff_bfin_put_pixels8uc_nornd(block, pixels, pixels + line_size,
+                                line_size, h);
 }
 
-
-static void bfin_put_pixels16_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_nornd(uint8_t *block, const uint8_t *pixels,
+                                    ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels16uc_nornd (block, pixels, pixels, line_size, h);
+    ff_bfin_put_pixels16uc_nornd(block, pixels, pixels, line_size, h);
 }
 
-static void bfin_put_pixels16_x2_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_x2_nornd(uint8_t *block, const uint8_t *pixels,
+                                       ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+1, line_size, h);
+    ff_bfin_put_pixels16uc_nornd(block, pixels, pixels + 1, line_size, h);
 }
 
-static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_y2_nornd(uint8_t *block, const uint8_t *pixels,
+                                       ptrdiff_t line_size, int h)
 {
-    ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size, h);
+    ff_bfin_put_pixels16uc_nornd(block, pixels, pixels + line_size,
+                                 line_size, h);
 }
 
 av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags)
diff --git a/libavcodec/bfin/hpeldsp_bfin.h b/libavcodec/bfin/hpeldsp_bfin.h
index 2d5b349adb..c19f1dc513 100644
--- a/libavcodec/bfin/hpeldsp_bfin.h
+++ b/libavcodec/bfin/hpeldsp_bfin.h
@@ -28,12 +28,22 @@
 
 #include "libavutil/bfin/attributes.h"
 
-void ff_bfin_z_put_pixels16_xy2     (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text;
-void ff_bfin_z_put_pixels8_xy2      (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text;
+void ff_bfin_z_put_pixels16_xy2(uint8_t *block, const uint8_t *s0,
+                                int dest_size, int line_size, int h) attribute_l1_text;
+void ff_bfin_z_put_pixels8_xy2(uint8_t *block, const uint8_t *s0,
+                               int dest_size, int line_size, int h) attribute_l1_text;
 
-void ff_bfin_put_pixels8uc        (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels16uc       (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels8uc_nornd  (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text;
+void ff_bfin_put_pixels8uc(uint8_t *block, const uint8_t *s0,
+                           const uint8_t *s1, int dest_size, int line_size,
+                           int h) attribute_l1_text;
+void ff_bfin_put_pixels16uc(uint8_t *block, const uint8_t *s0,
+                            const uint8_t *s1, int dest_size, int line_size,
+                            int h) attribute_l1_text;
+void ff_bfin_put_pixels8uc_nornd(uint8_t *block, const uint8_t *s0,
+                                 const uint8_t *s1, int line_size,
+                                 int h) attribute_l1_text;
+void ff_bfin_put_pixels16uc_nornd(uint8_t *block, const uint8_t *s0,
+                                  const uint8_t *s1, int line_size,
+                                  int h) attribute_l1_text;
 
 #endif /* AVCODEC_BFIN_HPELDSP_BFIN_H */