[SCM] libav/experimental: Make ff_spatial_idwt_{init, slice} static to dwt.c

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:22:45 UTC 2013


The following commit has been merged in the experimental branch:
commit ebb06d96ed3f6e1c16f2d40e55c151b5b5522918
Author: Diego Elio Pettenò <flameeyes at gmail.com>
Date:   Tue Jan 25 02:59:28 2011 +0100

    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 at jannau.net>

diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c
index 2ecb04a..d9d58de 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 8c3aa20..b10e4f5 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);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list