[SCM] libav/experimental: Make ff_float_to_int16*_c() static.

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


The following commit has been merged in the experimental branch:
commit 5ce5dbc5f3d0bce1f8d76fea1907c91469ebdd01
Author: Alex Converse <alex.converse at gmail.com>
Date:   Fri Jan 28 06:13:49 2011 +0000

    Make ff_float_to_int16*_c() static.
    
    Signed-off-by: Mans Rullgard <mans at mansr.com>

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 03a5eee..84f91fc 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -3913,13 +3913,13 @@ static av_always_inline int float_to_int16_one(const float *src){
     return av_clip_int16(lrintf(*src));
 }
 
-void ff_float_to_int16_c(int16_t *dst, const float *src, long len){
+static void ff_float_to_int16_c(int16_t *dst, const float *src, long len){
     int i;
     for(i=0; i<len; i++)
         dst[i] = float_to_int16_one(src+i);
 }
 
-void ff_float_to_int16_interleave_c(int16_t *dst, const float **src, long len, int channels){
+static void ff_float_to_int16_interleave_c(int16_t *dst, const float **src, long len, int channels){
     int i,j,c;
     if(channels==2){
         for(i=0; i<len; i++){
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index eabecf0..74831cf 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -70,8 +70,6 @@ void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc
 
 void ff_vector_fmul_window_c(float *dst, const float *src0, const float *src1,
                              const float *win, float add_bias, int len);
-void ff_float_to_int16_c(int16_t *dst, const float *src, long len);
-void ff_float_to_int16_interleave_c(int16_t *dst, const float **src, long len, int channels);
 
 /* encoding scans */
 extern const uint8_t ff_alternate_horizontal_scan[64];

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list