[FFmpeg-devel] [PATCH] x86/fladsp: add missing check to ff_flacdsp_init_x86()

Michael Niedermayer michaelni at gmx.at
Sun Feb 16 12:08:27 CET 2014


On Sun, Feb 16, 2014 at 11:40:52AM +0100, Paul B Mahol wrote:
> On 2/16/14, James Almer <jamrial at gmail.com> wrote:
> > Fixes compilation with flac decoder disabled and encoder enabled
> >
> > Signed-off-by: James Almer <jamrial at gmail.com>
> > ---
> >  libavcodec/x86/flacdsp_init.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/x86/flacdsp_init.c b/libavcodec/x86/flacdsp_init.c
> > index 151ce34..a071b3d 100644
> > --- a/libavcodec/x86/flacdsp_init.c
> > +++ b/libavcodec/x86/flacdsp_init.c
> > @@ -38,7 +38,7 @@ av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum
> > AVSampleFormat fmt,
> >              c->lpc = ff_flac_lpc_32_sse4;
> >      }
> >      if (EXTERNAL_XOP(cpu_flags)) {
> > -        if (bps > 16)
> > +        if (bps > 16 && CONFIG_FLAC_DECODER)
> >              c->lpc = ff_flac_lpc_32_xop;
> >      }
> >  #endif
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel at ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> ok

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many things microsoft did are stupid, but not doing something just because
microsoft did it is even more stupid. If everything ms did were stupid they
would be bankrupt already.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140216/2e45f09c/attachment.asc>


More information about the ffmpeg-devel mailing list