diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-08-21 18:09:59 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2015-08-22 08:29:10 -0700 |
| commit | 8d9fe002b33564934da7b6e0c7eba4a43a74d557 (patch) | |
| tree | a386fc6ef708303b64c4ddfd9b4be203d1b908f5 | |
| parent | 0aa9bbbc377ae100891cab94ce7de8623d3dcc3a (diff) | |
| download | ffmpeg-8d9fe002b33564934da7b6e0c7eba4a43a74d557.tar.gz | |
fmtconvert: Remove float_interleave*
They were not public or used anywhere.
| -rw-r--r-- | libavcodec/fmtconvert.c | 31 | ||||
| -rw-r--r-- | libavcodec/fmtconvert.h | 4 |
2 files changed, 0 insertions, 35 deletions
diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index e6fc509a96..1de1d318d2 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -51,34 +51,3 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx) if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx); if (HAVE_MIPSFPU) ff_fmt_convert_init_mips(c); } - -/* ffdshow custom code */ -void float_interleave(float *dst, const float **src, long len, int channels) -{ - int i,j,c; - if(channels==2){ - for(i=0; i<len; i++){ - dst[2*i] = src[0][i] / 32768.0f; - dst[2*i+1] = src[1][i] / 32768.0f; - } - }else{ - for(c=0; c<channels; c++) - for(i=0, j=c; i<len; i++, j+=channels) - dst[j] = src[c][i] / 32768.0f; - } -} - -void float_interleave_noscale(float *dst, const float **src, long len, int channels) -{ - int i,j,c; - if(channels==2){ - for(i=0; i<len; i++){ - dst[2*i] = src[0][i]; - dst[2*i+1] = src[1][i]; - } - }else{ - for(c=0; c<channels; c++) - for(i=0, j=c; i<len; i++, j+=channels) - dst[j] = src[c][i]; - } -} diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index 401ac3a1fc..4b8b9580d2 100644 --- a/libavcodec/fmtconvert.h +++ b/libavcodec/fmtconvert.h @@ -63,8 +63,4 @@ void ff_fmt_convert_init_ppc(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_mips(FmtConvertContext *c); -/* ffdshow custom code */ -void float_interleave(float *dst, const float **src, long len, int channels); -void float_interleave_noscale(float *dst, const float **src, long len, int channels); - #endif /* AVCODEC_FMTCONVERT_H */ |