aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-02-16 03:02:47 -0300
committerMichael Niedermayer <michaelni@gmx.at>2014-02-16 12:06:04 +0100
commitec482e738ddcb90b156cf306eb1911f7038efa19 (patch)
tree6b9426cfa5545721a2e69fd6a0745ee31f0b994b
parent8fe107609437909ddd2cf8f5690fe0158a0616f2 (diff)
downloadffmpeg-ec482e738ddcb90b156cf306eb1911f7038efa19.tar.gz
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@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/x86/flacdsp_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/flacdsp_init.c b/libavcodec/x86/flacdsp_init.c
index 151ce3401c..a071b3d3b7 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