diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 19:19:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 19:50:05 +0200 |
| commit | 5036c8b17b29623cd86b514474d1c0a81acf1e13 (patch) | |
| tree | 9c1c36326fbf1a9058b1da6bc999f50588064a0b | |
| parent | d5601cf6fc1c1606ec45466d5d72fd1e60a4ba3b (diff) | |
| parent | 12f129e545e5a5844b6ad7f3eb6a438015cad8bc (diff) | |
| download | ffmpeg-5036c8b17b29623cd86b514474d1c0a81acf1e13.tar.gz | |
Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'
* commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc':
x86: Unconditionally compile blockdsp and svq1enc init files
Conflicts:
libavcodec/x86/Makefile
blockdsp_mmx is renamed to blockdsp_init as we already have a blockdsp file
and _init is how all other such files are called
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/x86/blockdsp_init.c (renamed from libavcodec/x86/blockdsp_mmx.c) | 0 | ||||
| -rw-r--r-- | libavcodec/x86/svq1enc.c (renamed from libavcodec/x86/svq1enc_mmx.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index a25e80c62b..5730dc7b0a 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -3,7 +3,7 @@ OBJS += x86/constants.o \ OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_init.o -OBJS-$(CONFIG_BLOCKDSP) += x86/blockdsp_mmx.o +OBJS-$(CONFIG_BLOCKDSP) += x86/blockdsp_init.o OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp_init.o OBJS-$(CONFIG_DCT) += x86/dct_init.o OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o @@ -46,7 +46,7 @@ OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \ x86/rv40dsp_init.o -OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc_mmx.o +OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o OBJS-$(CONFIG_V210_DECODER) += x86/v210-init.o OBJS-$(CONFIG_TTA_DECODER) += x86/ttadsp_init.o OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o diff --git a/libavcodec/x86/blockdsp_mmx.c b/libavcodec/x86/blockdsp_init.c index 7780184af6..7780184af6 100644 --- a/libavcodec/x86/blockdsp_mmx.c +++ b/libavcodec/x86/blockdsp_init.c diff --git a/libavcodec/x86/svq1enc_mmx.c b/libavcodec/x86/svq1enc.c index 01f16b17bb..01f16b17bb 100644 --- a/libavcodec/x86/svq1enc_mmx.c +++ b/libavcodec/x86/svq1enc.c |