On Tuesday, November 8, 2011, Diego Biurrun <[email protected]> wrote: > --- > libavcodec/x86/cabac.h | 4 ++-- > libavcodec/x86/h264_i386.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h > index 545cf7c..5da421a 100644 > --- a/libavcodec/x86/cabac.h > +++ b/libavcodec/x86/cabac.h > @@ -82,7 +82,7 @@ > "add "tmp" , "low" \n\t"\ > "1: \n\t" > > -#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) > +#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) > #define get_cabac_inline get_cabac_inline_x86 > static av_always_inline int get_cabac_inline_x86(CABACContext *c, > uint8_t *const state) > @@ -99,7 +99,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c, > ); > return bit & 1; > } > -#endif /* ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ > +#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ > > #define get_cabac_bypass_sign get_cabac_bypass_sign_x86 > static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val) > diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h > index f32310c..7a361cd 100644 > --- a/libavcodec/x86/h264_i386.h > +++ b/libavcodec/x86/h264_i386.h > @@ -36,7 +36,7 @@ > > //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet > //as that would make optimization work hard) > -#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) > +#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) > static int decode_significance_x86(CABACContext *c, int max_coeff, > uint8_t *significant_coeff_ctx_base, > int *index, x86_reg last_off){ > @@ -145,6 +145,6 @@ static int decode_significance_8x8_x86(CABACContext *c, > ); > return coeff_count; > } > -#endif /* ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ > +#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ > > #endif /* AVCODEC_X86_H264_I386_H */ > -- > 1.7.1 > > _______________________________________________ > libav-devel mailing list > [email protected] > https://lists.libav.org/mailman/listinfo/libav-devel >
Thanks Diego. I'll check this later today when I'm back in front of my computers. -- Sean McG.
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
