On Mon, Oct 03, 2011 at 02:26:46PM -0700, Ronald S. Bultje wrote:
> On Mon, Oct 3, 2011 at 12:04 PM, Diego Biurrun <[email protected]> wrote:
> > On Mon, Oct 03, 2011 at 11:37:36AM -0700, Ronald S. Bultje wrote:
> >> From: "Ronald S. Bultje" <[email protected]>
> >>
> >> diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
> >> index 7f20c83..d1506be 100644
> >> --- a/libavcodec/proresdsp.c
> >> +++ b/libavcodec/proresdsp.c
> >> @@ -56,6 +56,8 @@ void ff_proresdsp_init(ProresDSPContext *dsp)
> >> dsp->idct_put = prores_idct_put_c;
> >> dsp->idct_permutation_type = FF_NO_IDCT_PERM;
> >>
> >> + if (HAVE_MMX) ff_proresdsp_x86_init(dsp);
> >
> > Break the line please.
>
> I think we do it like this everywhere in simd-init functions?
We are all types of inconsistent in old files, but that is no reason
to carry it forward to new files.
> >> --- a/libavcodec/x86/Makefile
> >> +++ b/libavcodec/x86/Makefile
> >> @@ -33,6 +33,9 @@ MMX-OBJS-$(CONFIG_ENCODERS) +=
> >> x86/dsputilenc_mmx.o
> >> YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_yasm.o
> >> MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
> >> MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
> >> +YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
> >> +MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp-init.o \
> >> + $(YASM-OBJS-yes)
> >
> > This is wrong, $(YASM-OBJS-yes) is already added to MMX-OBJS elsewhere.
>
> OK, but that's wrong, it should only be if CONFIG_PRORES_DECODER is
> yes. How to do that?
Janne already explained. The following lines later in the file are decisive:
MMX-OBJS-$(HAVE_YASM) += [...] \
$(YASM-OBJS-yes)
So we already have the same logic you try to implement, but your version
would break if YASM support is missing.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
