diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:20:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:20:41 +0100 |
| commit | 63a97d56748a5deaaf5b9c26ac49f5086a8cceeb (patch) | |
| tree | 291953499757de6345b4b7c063f27761d206050d /libavutil | |
| parent | b1064dd783b25b80ec0790876877bc886c2ec449 (diff) | |
| parent | b6649ab5037fb55f78c2606f3d23cea0867cdeaa (diff) | |
| download | ffmpeg-63a97d56748a5deaaf5b9c26ac49f5086a8cceeb.tar.gz | |
Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa':
cosmetics: Remove unnecessary extern keywords from function declarations
Conflicts:
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/ppc/float_dsp_altivec.h | 20 | ||||
| -rw-r--r-- | libavutil/x86/float_dsp_init.c | 26 |
2 files changed, 23 insertions, 23 deletions
diff --git a/libavutil/ppc/float_dsp_altivec.h b/libavutil/ppc/float_dsp_altivec.h index b262a83548..e1d530afa5 100644 --- a/libavutil/ppc/float_dsp_altivec.h +++ b/libavutil/ppc/float_dsp_altivec.h @@ -21,18 +21,18 @@ #ifndef AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H #define AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H -extern void ff_vector_fmul_altivec(float *dst, const float *src0, - const float *src1, int len); +void ff_vector_fmul_altivec(float *dst, const float *src0, + const float *src1, int len); -extern void ff_vector_fmul_window_altivec(float *dst, const float *src0, - const float *src1, const float *win, - int len); +void ff_vector_fmul_window_altivec(float *dst, const float *src0, + const float *src1, const float *win, + int len); -extern void ff_vector_fmul_add_altivec(float *dst, const float *src0, - const float *src1, const float *src2, - int len); +void ff_vector_fmul_add_altivec(float *dst, const float *src0, + const float *src1, const float *src2, + int len); -extern void ff_vector_fmul_reverse_altivec(float *dst, const float *src0, - const float *src1, int len); +void ff_vector_fmul_reverse_altivec(float *dst, const float *src0, + const float *src1, int len); #endif /* AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H */ diff --git a/libavutil/x86/float_dsp_init.c b/libavutil/x86/float_dsp_init.c index 5c6383bc74..16c6f3615e 100644 --- a/libavutil/x86/float_dsp_init.c +++ b/libavutil/x86/float_dsp_init.c @@ -23,23 +23,23 @@ #include "cpu.h" #include "asm.h" -extern void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1, +void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1, + int len); +void ff_vector_fmul_avx(float *dst, const float *src0, const float *src1, + int len); + +void ff_vector_fmac_scalar_sse(float *dst, const float *src, float mul, int len); -extern void ff_vector_fmul_avx(float *dst, const float *src0, const float *src1, +void ff_vector_fmac_scalar_avx(float *dst, const float *src, float mul, int len); -extern void ff_vector_fmac_scalar_sse(float *dst, const float *src, float mul, - int len); -extern void ff_vector_fmac_scalar_avx(float *dst, const float *src, float mul, - int len); - -extern void ff_vector_fmul_scalar_sse(float *dst, const float *src, float mul, - int len); +void ff_vector_fmul_scalar_sse(float *dst, const float *src, float mul, + int len); -extern void ff_vector_dmul_scalar_sse2(double *dst, const double *src, - double mul, int len); -extern void ff_vector_dmul_scalar_avx(double *dst, const double *src, - double mul, int len); +void ff_vector_dmul_scalar_sse2(double *dst, const double *src, + double mul, int len); +void ff_vector_dmul_scalar_avx(double *dst, const double *src, + double mul, int len); void ff_vector_fmul_add_sse(float *dst, const float *src0, const float *src1, const float *src2, int len); |