audiodsp: x86: Remove pointless header file

Message ID 1475700098-20072-1-git-send-email-diego@biurrun.de
State Committed
Commit 788544ff0ed6fe67fda80ad6d3a0796ace035584
Headers show

Commit Message

Diego Biurrun Oct. 5, 2016, 8:41 p.m.
Its single forward declaration can be moved to the only place
it is used, like is done for all other dsp init files.
---
 libavcodec/x86/audiodsp.h      | 25 -------------------------
 libavcodec/x86/audiodsp_init.c |  4 +++-
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 libavcodec/x86/audiodsp.h

Comments

Anton Khirnov Oct. 10, 2016, 5:36 p.m. | #1
Quoting Diego Biurrun (2016-10-05 22:41:38)
> Its single forward declaration can be moved to the only place
> it is used, like is done for all other dsp init files.
> ---
>  libavcodec/x86/audiodsp.h      | 25 -------------------------
>  libavcodec/x86/audiodsp_init.c |  4 +++-
>  2 files changed, 3 insertions(+), 26 deletions(-)
>  delete mode 100644 libavcodec/x86/audiodsp.h
> 
> diff --git a/libavcodec/x86/audiodsp.h b/libavcodec/x86/audiodsp.h
> deleted file mode 100644
> index c87ee45..0000000
> --- a/libavcodec/x86/audiodsp.h
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -/*
> - * This file is part of Libav.
> - *
> - * Libav is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2.1 of the License, or (at your option) any later version.
> - *
> - * Libav is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with Libav; if not, write to the Free Software
> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> - */
> -
> -#ifndef AVCODEC_X86_AUDIODSP_H
> -#define AVCODEC_X86_AUDIODSP_H
> -
> -void ff_vector_clipf_sse(float *dst, const float *src,
> -                         int len, float min, float max);
> -
> -#endif /* AVCODEC_X86_AUDIODSP_H */
> diff --git a/libavcodec/x86/audiodsp_init.c b/libavcodec/x86/audiodsp_init.c
> index 2373115..093f3f0 100644
> --- a/libavcodec/x86/audiodsp_init.c
> +++ b/libavcodec/x86/audiodsp_init.c
> @@ -23,7 +23,6 @@
>  #include "libavutil/cpu.h"
>  #include "libavutil/x86/cpu.h"
>  #include "libavcodec/audiodsp.h"
> -#include "audiodsp.h"
>  
>  int32_t ff_scalarproduct_int16_mmxext(const int16_t *v1, const int16_t *v2,
>                                        int order);
> @@ -39,6 +38,9 @@ void ff_vector_clip_int32_int_sse2(int32_t *dst, const int32_t *src,
>  void ff_vector_clip_int32_sse4(int32_t *dst, const int32_t *src,
>                                 int32_t min, int32_t max, unsigned int len);
>  
> +void ff_vector_clipf_sse(float *dst, const float *src,
> +                         int len, float min, float max);
> +
>  av_cold void ff_audiodsp_init_x86(AudioDSPContext *c)
>  {
>      int cpu_flags = av_get_cpu_flags();
> -- 
> 2.7.3

ok.

Patch

diff --git a/libavcodec/x86/audiodsp.h b/libavcodec/x86/audiodsp.h
deleted file mode 100644
index c87ee45..0000000
--- a/libavcodec/x86/audiodsp.h
+++ /dev/null
@@ -1,25 +0,0 @@ 
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_X86_AUDIODSP_H
-#define AVCODEC_X86_AUDIODSP_H
-
-void ff_vector_clipf_sse(float *dst, const float *src,
-                         int len, float min, float max);
-
-#endif /* AVCODEC_X86_AUDIODSP_H */
diff --git a/libavcodec/x86/audiodsp_init.c b/libavcodec/x86/audiodsp_init.c
index 2373115..093f3f0 100644
--- a/libavcodec/x86/audiodsp_init.c
+++ b/libavcodec/x86/audiodsp_init.c
@@ -23,7 +23,6 @@ 
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/audiodsp.h"
-#include "audiodsp.h"
 
 int32_t ff_scalarproduct_int16_mmxext(const int16_t *v1, const int16_t *v2,
                                       int order);
@@ -39,6 +38,9 @@  void ff_vector_clip_int32_int_sse2(int32_t *dst, const int32_t *src,
 void ff_vector_clip_int32_sse4(int32_t *dst, const int32_t *src,
                                int32_t min, int32_t max, unsigned int len);
 
+void ff_vector_clipf_sse(float *dst, const float *src,
+                         int len, float min, float max);
+
 av_cold void ff_audiodsp_init_x86(AudioDSPContext *c)
 {
     int cpu_flags = av_get_cpu_flags();