diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:06:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:06:42 +0100 |
| commit | 7fce8c752d87ca4738179bb7e9238bae67abdeac (patch) | |
| tree | cf884999bbf61ac8a23cc37843915e49e51a42d7 /libavcodec/x86 | |
| parent | 5c17377e28e818d3074a608d42821d66f1d26e8d (diff) | |
| parent | 71f1ad37d858b810b71a4af1c25771beaa50b27b (diff) | |
| download | ffmpeg-7fce8c752d87ca4738179bb7e9238bae67abdeac.tar.gz | |
Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
lavc: do not compile fmtconvert unconditionally
Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 7c4f4cd87d..6b9164ab12 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -1,5 +1,4 @@ OBJS += x86/constants.o \ - x86/fmtconvert_init.o \ # subsystems OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o @@ -11,6 +10,7 @@ OBJS-$(CONFIG_FDCTDSP) += x86/fdctdsp_init.o OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp_init.o OBJS-$(CONFIG_FLAC_ENCODER) += x86/flacdsp_init.o +OBJS-$(CONFIG_FMTCONVERT) += x86/fmtconvert_init.o OBJS-$(CONFIG_H263DSP) += x86/h263dsp_init.o OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o @@ -82,7 +82,6 @@ MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o # YASM optimizations YASM-OBJS += x86/deinterlace.o \ - x86/fmtconvert.o \ # subsystems YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o @@ -98,6 +97,7 @@ YASM-OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp.o ifdef CONFIG_GPL YASM-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flac_dsp_gpl.o endif +YASM-OBJS-$(CONFIG_FMTCONVERT) += x86/fmtconvert.o YASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \ x86/h264_chromamc_10bit.o |