diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 10:45:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 10:49:43 +0200 |
| commit | 3a0e21f037c082e431eff62c47203cf4d77c88cb (patch) | |
| tree | 1a0fe50d1875aa4cdf353e5c5919eac94ec7ad1d /libavcodec/x86 | |
| parent | f7a267affe8066e0b587e8ea477f437728f31fc7 (diff) | |
| parent | 186599ffe0a94d587434e5e46e190e038357ed99 (diff) | |
| download | ffmpeg-3a0e21f037c082e431eff62c47203cf4d77c88cb.tar.gz | |
Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'
* commit '186599ffe0a94d587434e5e46e190e038357ed99':
build: cosmetics: Place unconditional before conditional OBJS lines
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 429574460a..6d51b161ec 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -53,6 +53,9 @@ 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 +YASM-OBJS += x86/deinterlace.o \ + x86/fmtconvert.o \ + YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o @@ -97,6 +100,3 @@ YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp.o YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o YASM-OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp.o - -YASM-OBJS += x86/deinterlace.o \ - x86/fmtconvert.o \ |