[FFmpeg-devel] [PATCH 05/41] avcodec/videodsp: Make ff_emulated_edge_mc_16 static

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Fri Jun 10 02:54:47 EEST 2022


Only ff_emulated_edge_mc_8() is used outside of lavc/videodsp.c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/videodsp.c          | 4 ++++
 libavcodec/videodsp.h          | 1 -
 libavcodec/videodsp_template.c | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/videodsp.c b/libavcodec/videodsp.c
index 2198d46c15..02af046b81 100644
--- a/libavcodec/videodsp.c
+++ b/libavcodec/videodsp.c
@@ -25,11 +25,15 @@
 #include "videodsp.h"
 
 #define BIT_DEPTH 8
+#define STATIC
 #include "videodsp_template.c"
+#undef STATIC
 #undef BIT_DEPTH
 
 #define BIT_DEPTH 16
+#define STATIC static
 #include "videodsp_template.c"
+#undef STATIC
 #undef BIT_DEPTH
 
 static void just_return(uint8_t *buf, ptrdiff_t stride, int h)
diff --git a/libavcodec/videodsp.h b/libavcodec/videodsp.h
index ac971dc57f..b5219d236c 100644
--- a/libavcodec/videodsp.h
+++ b/libavcodec/videodsp.h
@@ -36,7 +36,6 @@ void ff_emulated_edge_mc_ ## depth(uint8_t *dst, const uint8_t *src, \
                                    int src_x, int src_y, int w, int h);
 
 EMULATED_EDGE(8)
-EMULATED_EDGE(16)
 
 typedef struct VideoDSPContext {
     /**
diff --git a/libavcodec/videodsp_template.c b/libavcodec/videodsp_template.c
index 55123a5844..8bc3290248 100644
--- a/libavcodec/videodsp_template.c
+++ b/libavcodec/videodsp_template.c
@@ -20,6 +20,7 @@
  */
 
 #include "bit_depth_template.c"
+STATIC
 void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
                                ptrdiff_t buf_linesize,
                                ptrdiff_t src_linesize,
-- 
2.34.1



More information about the ffmpeg-devel mailing list