diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:42:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:42:51 +0200 |
| commit | d0aa60da10229d79aaa087d47dff92fc7518f1e8 (patch) | |
| tree | eb4893099931aa307c9fc4c9d7fb397292972eed /libavcodec/x86/Makefile | |
| parent | 3fee9fa0223263d0bcc1eb108a9499180705d3be (diff) | |
| parent | 8db00081a37d5b7e23918ee500bb16bc59b57197 (diff) | |
| download | ffmpeg-d0aa60da10229d79aaa087d47dff92fc7518f1e8.tar.gz | |
Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'
* commit '8db00081a37d5b7e23918ee500bb16bc59b57197':
x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/Makefile')
| -rw-r--r-- | libavcodec/x86/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 295e399214..50e64f72ee 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -53,9 +53,9 @@ YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\ x86/dwt_yasm.o YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o \ - x86/fpelbase.o \ + x86/fpel.o \ x86/mpeg4qpel.o \ - x86/qpelbase.o + x86/qpel.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_H263_DECODER) += x86/h263_loopfilter.o @@ -72,10 +72,10 @@ YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \ x86/h264_intrapred_10bit.o YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_8bit.o \ x86/h264_qpel_10bit.o \ - x86/qpelbase.o \ - x86/fpelbase.o -YASM-OBJS-$(CONFIG_HPELDSP) += x86/hpeldsp.o \ - x86/fpelbase.o + x86/fpel.o \ + x86/qpel.o +YASM-OBJS-$(CONFIG_HPELDSP) += x86/fpel.o \ + x86/hpeldsp.o YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o |