Message ID | AS8P250MB074473DA76F7C7EFA8225DFE8F539@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | ba07c84bf961e034b8b8f80603358f8ebab6c171 |
Headers | show |
Series | [FFmpeg-devel,1/3] avcodec/amrwbdec, lsp: Include mips headers only #if ARCH_MIPS | expand |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/amrwbdec.c | 4 ++++ > libavcodec/lsp.c | 4 ++++ > 2 files changed, 8 insertions(+) > > diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c > index ea3812cd9a..b59066adcf 100644 > --- a/libavcodec/amrwbdec.c > +++ b/libavcodec/amrwbdec.c > @@ -24,6 +24,8 @@ > * AMR wideband decoder > */ > > +#include "config.h" > + > #include "libavutil/channel_layout.h" > #include "libavutil/common.h" > #include "libavutil/lfg.h" > @@ -42,7 +44,9 @@ > #include "amr.h" > > #include "amrwbdata.h" > +#if ARCH_MIPS > #include "mips/amrwbdec_mips.h" > +#endif /* ARCH_MIPS */ > > typedef struct AMRWBContext { > AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream > diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c > index 90f2efaafe..9e7bc5f87a 100644 > --- a/libavcodec/lsp.c > +++ b/libavcodec/lsp.c > @@ -23,11 +23,15 @@ > > #include <math.h> > > +#include "config.h" > + > #define FRAC_BITS 14 > #include "libavutil/macros.h" > #include "mathops.h" > #include "lsp.h" > +#if ARCH_MIPS > #include "libavcodec/mips/lsp_mips.h" > +#endif /* ARCH_MIPS */ > #include "libavutil/avassert.h" > > void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order) Will apply tonight unless there are objections. - Andreas
diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index ea3812cd9a..b59066adcf 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -24,6 +24,8 @@ * AMR wideband decoder */ +#include "config.h" + #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/lfg.h" @@ -42,7 +44,9 @@ #include "amr.h" #include "amrwbdata.h" +#if ARCH_MIPS #include "mips/amrwbdec_mips.h" +#endif /* ARCH_MIPS */ typedef struct AMRWBContext { AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 90f2efaafe..9e7bc5f87a 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -23,11 +23,15 @@ #include <math.h> +#include "config.h" + #define FRAC_BITS 14 #include "libavutil/macros.h" #include "mathops.h" #include "lsp.h" +#if ARCH_MIPS #include "libavcodec/mips/lsp_mips.h" +#endif /* ARCH_MIPS */ #include "libavutil/avassert.h" void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/amrwbdec.c | 4 ++++ libavcodec/lsp.c | 4 ++++ 2 files changed, 8 insertions(+)