summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2011-01-25 02:59:28 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-01-26 03:43:32 +0100
commite164553a82b92f3c5a86504d87bcb4882effbfb2 (patch)
tree04a83b5dbe39f3825aeba3b6a4d09b428d107069
parentff0d737d6e6708f86a4545af6489e3cfe5284c9a (diff)
Make ff_spatial_idwt_{init, slice} static to dwt.c
Both functions seem to be commanded by the ff_spatial_idwt function instead. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit ebb06d96ed3f6e1c16f2d40e55c151b5b5522918)
-rw-r--r--libavcodec/dwt.c4
-rw-r--r--libavcodec/dwt.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c
index 2ecb04a4ee..d9d58de8b2 100644
--- a/libavcodec/dwt.c
+++ b/libavcodec/dwt.c
@@ -697,7 +697,7 @@ void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, slice_buffe
}
}
-void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
+static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){
int level;
for(level=decomposition_count-1; level>=0; level--){
switch(type){
@@ -707,7 +707,7 @@ void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int heigh
}
}
-void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){
+static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){
const int support = type==1 ? 3 : 5;
int level;
if(type==2) return;
diff --git a/libavcodec/dwt.h b/libavcodec/dwt.h
index 8c3aa204d6..b10e4f5596 100644
--- a/libavcodec/dwt.h
+++ b/libavcodec/dwt.h
@@ -146,8 +146,6 @@ void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, in
void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count);
void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y);
-void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count);
-void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y);
void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count);
void ff_dwt_init(DWTContext *c);