[FFmpeg-devel] [PATCH] riscv: remove unnecessary #include's

Lynne dev at lynne.ee
Wed Oct 5 08:02:00 EEST 2022


Oct 4, 2022, 19:49 by remi at remlab.net:

> Pointed out by Andreas Rheinhardt.
> ---
>  libavcodec/riscv/fmtconvert_rvv.S  | 1 -
>  libavcodec/riscv/idctdsp_rvv.S     | 1 -
>  libavcodec/riscv/pixblockdsp_rvi.S | 1 -
>  libavcodec/riscv/pixblockdsp_rvv.S | 1 -
>  libavcodec/riscv/vorbisdsp_rvv.S   | 1 -
>  libavutil/riscv/asm.S              | 2 --
>  libavutil/riscv/fixed_dsp_rvv.S    | 1 -
>  libavutil/riscv/float_dsp_rvv.S    | 1 -
>  8 files changed, 9 deletions(-)
>
> diff --git a/libavcodec/riscv/fmtconvert_rvv.S b/libavcodec/riscv/fmtconvert_rvv.S
> index 49893ec8d7..51365753d9 100644
> --- a/libavcodec/riscv/fmtconvert_rvv.S
> +++ b/libavcodec/riscv/fmtconvert_rvv.S
> @@ -18,7 +18,6 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  */
>  
> -#include "config.h"
>  #include "libavutil/riscv/asm.S"
>  
>  func ff_int32_to_float_fmul_scalar_rvv, zve32f
> diff --git a/libavcodec/riscv/idctdsp_rvv.S b/libavcodec/riscv/idctdsp_rvv.S
> index f5e1165eee..06e64e6529 100644
> --- a/libavcodec/riscv/idctdsp_rvv.S
> +++ b/libavcodec/riscv/idctdsp_rvv.S
> @@ -18,7 +18,6 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  */
>  
> -#include "config.h"
>  #include "libavutil/riscv/asm.S"
>  
>  func ff_put_pixels_clamped_rvv, zve32x
> diff --git a/libavcodec/riscv/pixblockdsp_rvi.S b/libavcodec/riscv/pixblockdsp_rvi.S
> index e84170244b..efdd422228 100644
> --- a/libavcodec/riscv/pixblockdsp_rvi.S
> +++ b/libavcodec/riscv/pixblockdsp_rvi.S
> @@ -18,7 +18,6 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  */
>  
> -#include "config.h"
>  #include "libavutil/riscv/asm.S"
>  
>  func ff_get_pixels_8_rvi
> diff --git a/libavcodec/riscv/pixblockdsp_rvv.S b/libavcodec/riscv/pixblockdsp_rvv.S
> index c125408523..1a364e6dab 100644
> --- a/libavcodec/riscv/pixblockdsp_rvv.S
> +++ b/libavcodec/riscv/pixblockdsp_rvv.S
> @@ -18,7 +18,6 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  */
>  
> -#include "config.h"
>  #include "libavutil/riscv/asm.S"
>  
>  func ff_get_pixels_8_rvv, zve32x
> diff --git a/libavcodec/riscv/vorbisdsp_rvv.S b/libavcodec/riscv/vorbisdsp_rvv.S
> index bbe9c7dc6d..f45e7dc2f1 100644
> --- a/libavcodec/riscv/vorbisdsp_rvv.S
> +++ b/libavcodec/riscv/vorbisdsp_rvv.S
> @@ -18,7 +18,6 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  */
>  
> -#include "config.h"
>  #include "libavutil/riscv/asm.S"
>  
>  func ff_vorbis_inverse_coupling_rvv, zve32f
> diff --git a/libavutil/riscv/asm.S b/libavutil/riscv/asm.S
> index de5e1ad0a6..ffa0bd9068 100644
> --- a/libavutil/riscv/asm.S
> +++ b/libavutil/riscv/asm.S
> @@ -19,8 +19,6 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  */
>  
> -#include "config.h"
> -
>  #if defined (__riscv_float_abi_soft)
>  #define NOHWF
>  #define NOHWD
> diff --git a/libavutil/riscv/fixed_dsp_rvv.S b/libavutil/riscv/fixed_dsp_rvv.S
> index 0e78734b4c..a91316e1da 100644
> --- a/libavutil/riscv/fixed_dsp_rvv.S
> +++ b/libavutil/riscv/fixed_dsp_rvv.S
> @@ -18,7 +18,6 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  */
>  
> -#include "config.h"
>  #include "asm.S"
>  
>  // (a0) = (a0) + (a1), (a1) = (a0) - (a1) [0..a2-1]
> diff --git a/libavutil/riscv/float_dsp_rvv.S b/libavutil/riscv/float_dsp_rvv.S
> index ab2e0c42d7..2bf8c6ee96 100644
> --- a/libavutil/riscv/float_dsp_rvv.S
> +++ b/libavutil/riscv/float_dsp_rvv.S
> @@ -18,7 +18,6 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  */
>  
> -#include "config.h"
>  #include "asm.S"
>  
>  // (a0) = (a1) * (a2) [0..a3-1]
>

Pushed alongside the alacdsp patch.
Thanks.


More information about the ffmpeg-devel mailing list