diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 23:40:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 23:40:26 +0100 |
| commit | 274e48d8ac1e13e53978843edc4c949ed4a79d63 (patch) | |
| tree | a22ad705ecb4d9008d0fb368a07f299cba667030 | |
| parent | 9cb3c1a4d9dbf28d032f5af8fde85993f8148a54 (diff) | |
| download | ffmpeg-274e48d8ac1e13e53978843edc4c949ed4a79d63.tar.gz | |
x86/Makefile: move dirac_dwt to right type
Fix build failure without yasm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 6f10d060f9..c596ae7bc7 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -37,6 +37,7 @@ MMX-OBJS += x86/dsputil_mmx.o \ MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ x86/motion_est.o +MMX-OBJS-$(CONFIG_DIRAC_DECODER) += x86/dirac_dwt.o MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o @@ -45,7 +46,7 @@ YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\ - x86/dwt_yasm.o x86/dirac_dwt.o + x86/dwt_yasm.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \ |