[FFmpeg-cvslog] avcodec/snow_dwt: Make ff_snow_(horizont|vertic)al_compose97i static

Andreas Rheinhardt git at videolan.org
Thu Sep 9 00:49:20 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Sep  6 13:38:05 2021 +0200| [854f7bab5a766d3b4530bb5fdd2c6b7e4faf5e02] | committer: Andreas Rheinhardt

avcodec/snow_dwt: Make ff_snow_(horizont|vertic)al_compose97i static

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=854f7bab5a766d3b4530bb5fdd2c6b7e4faf5e02
---

 libavcodec/snow_dwt.c | 16 ++++++++--------
 libavcodec/snow_dwt.h |  4 ----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/libavcodec/snow_dwt.c b/libavcodec/snow_dwt.c
index 25681e7edd..3dca3c6d30 100644
--- a/libavcodec/snow_dwt.c
+++ b/libavcodec/snow_dwt.c
@@ -462,7 +462,7 @@ static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer,
     cs->y  += 2;
 }
 
-void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width)
+static void snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width)
 {
     const int w2 = (width + 1) >> 1;
     int x;
@@ -526,9 +526,9 @@ static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
         b1[i] -= (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS;
 }
 
-void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
-                                 IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
-                                 int width)
+static void snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
+                                     IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
+                                     int width)
 {
     int i;
 
@@ -625,9 +625,9 @@ static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer,
         vertical_compose97iH0(b0, b1, b2, width);
 
     if (y - 1 < (unsigned)height)
-        ff_snow_horizontal_compose97i(b0, temp, width);
+        snow_horizontal_compose97i(b0, temp, width);
     if (y + 0 < (unsigned)height)
-        ff_snow_horizontal_compose97i(b1, temp, width);
+        snow_horizontal_compose97i(b1, temp, width);
 
     cs->b0  = b2;
     cs->b1  = b3;
@@ -849,8 +849,8 @@ av_cold void ff_dsputil_init_dwt(MECmpContext *c)
 
 av_cold void ff_dwt_init(SnowDWTContext *c)
 {
-    c->vertical_compose97i   = ff_snow_vertical_compose97i;
-    c->horizontal_compose97i = ff_snow_horizontal_compose97i;
+    c->vertical_compose97i   = snow_vertical_compose97i;
+    c->horizontal_compose97i = snow_horizontal_compose97i;
     c->inner_add_yblock      = ff_snow_inner_add_yblock;
 
     if (HAVE_MMX)
diff --git a/libavcodec/snow_dwt.h b/libavcodec/snow_dwt.h
index ee699de35e..390bc57130 100644
--- a/libavcodec/snow_dwt.h
+++ b/libavcodec/snow_dwt.h
@@ -99,10 +99,6 @@ void ff_slice_buffer_flush(slice_buffer *buf);
 void ff_slice_buffer_destroy(slice_buffer *buf);
 IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line);
 
-void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
-                                 IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
-                                 int width);
-void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width);
 void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride,
                               uint8_t **block, int b_w, int b_h, int src_x,
                               int src_y, int src_stride, slice_buffer *sb,



More information about the ffmpeg-cvslog mailing list