[FFmpeg-devel] [PATCH] mips: Add dependencies on HAVE_INLINE_ASM

Vitor Sessak vitor1001 at gmail.com
Wed Nov 7 21:45:13 CET 2012


Hello

On 11/06/2012 04:24 PM, Nedeljko Babic wrote:
> Add dependencies on HAVE_INLINE_ASM for files and parts of code
>   where it is necessary.
>
> Signed-off-by: Nedeljko Babic <nbabic at mips.com>
> ---
>   libavcodec/mips/Makefile             |    4 ++--
>   libavcodec/mips/acelp_filters_mips.c |    5 +++++
>   libavcodec/mips/acelp_vectors_mips.c |    5 +++++
>   libavcodec/mips/amrwbdec_mips.c      |    2 ++
>   libavcodec/mips/celp_filters_mips.c  |    5 +++++
>   libavcodec/mips/celp_math_mips.c     |    5 +++++
>   libavcodec/mips/dsputil_mips.c       |    4 ++++
>   libavcodec/mips/fft_mips.c           |    4 ++--
>   libavcodec/mips/fmtconvert_mips.c    |    4 ++++
>   libavcodec/mpegaudiodec.c            |    8 ++++----
>   10 files changed, 38 insertions(+), 8 deletions(-)

All ok, besides:

> --- a/libavcodec/mpegaudiodec.c
> +++ b/libavcodec/mpegaudiodec.c
> @@ -1172,13 +1172,13 @@ found2:
>   }
>
>   #if CONFIG_FLOAT
> -#if HAVE_MIPSFPU
> +#if HAVE_MIPSFPU && HAVE_INLINE_ASM
>   #   include "mips/compute_antialias_float.h"
> -#endif /* HAVE_MIPSFPU */
> +#endif /* HAVE_MIPSFPU && HAVE_INLINE_ASM */
>   #else
> -#if HAVE_MIPSDSPR1
> +#if HAVE_MIPSDSPR1 && HAVE_INLINE_ASM
>   #   include "mips/compute_antialias_fixed.h"
> -#endif /* HAVE_MIPSDSPR1 */
> +#endif /* HAVE_MIPSDSPR1 && HAVE_INLINE_ASM */
>   #endif /* CONFIG_FLOAT */

I think it would be cleaner to change only 
mips/compute_antialias_fixed.h, even if to put the whole file inside an 
#if HAVE_INLNE_ASM.

-Vitor



More information about the ffmpeg-devel mailing list