On 2014-01-15 10:11:04 +0200, Martin Storsj?? wrote:
> On Wed, 15 Jan 2014, Janne Grunau wrote:
>
> > Signed-off-by: Janne Grunau <[email protected]>
> > ---
> > libavcodec/dct-test.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
> > index d71f7a3..5fc4de9 100644
> > --- a/libavcodec/dct-test.c
> > +++ b/libavcodec/dct-test.c
> > @@ -123,7 +123,6 @@ static const struct algo idct_tab[] = {
> > #if ARCH_ARM
> >     { "SIMPLE-ARM",     ff_simple_idct_arm,    NO_PERM  },
> >     { "INT-ARM",        ff_j_rev_dct_arm,      MMX_PERM },
> > -#endif
> > #if HAVE_ARMV5TE
> >     { "SIMPLE-ARMV5TE", ff_simple_idct_armv5te,NO_PERM,   
> > AV_CPU_FLAG_ARMV5TE },
> > #endif
> > @@ -133,6 +132,7 @@ static const struct algo idct_tab[] = {
> > #if HAVE_NEON
> >     { "SIMPLE-NEON",    ff_simple_idct_neon, PARTTRANS_PERM, 
> > AV_CPU_FLAG_NEON },
> > #endif
> > +#endif
>
> Hmm, I think this one would be cleaner if you kept the ARCH_ARM endif
> where it is and just changed HAVE_NEON into HAVE_NEON && ARCH_ARM, but I
> really don't mind much either way.

Yes, code and change looks clearer. I chose the original change for
making the job of the preprocessor easier.

Signed-off-by: Janne Grunau <[email protected]>
---
 libavcodec/dct-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index d71f7a3..74a4206 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -130,7 +130,7 @@ static const struct algo idct_tab[] = {
 #if HAVE_ARMV6
     { "SIMPLE-ARMV6",   ff_simple_idct_armv6,  MMX_PERM,  AV_CPU_FLAG_ARMV6   
},
 #endif
-#if HAVE_NEON
+#if HAVE_NEON && ARCH_ARM
     { "SIMPLE-NEON",    ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON 
},
 #endif
 
-- 
1.8.5.2

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to