[FFmpeg-cvslog] x86/fladsp: add missing check to ff_flacdsp_init_x86()
James Almer
git at videolan.org
Sun Feb 16 13:28:53 CET 2014
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Feb 16 03:02:47 2014 -0300| [ec482e738ddcb90b156cf306eb1911f7038efa19] | committer: Michael Niedermayer
x86/fladsp: add missing check to ff_flacdsp_init_x86()
Fixes compilation with flac decoder disabled and encoder enabled
Signed-off-by: James Almer <jamrial at gmail.com>
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec482e738ddcb90b156cf306eb1911f7038efa19
---
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
More information about the ffmpeg-cvslog
mailing list