summaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/Makefile
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2010-09-01 20:56:16 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-09-01 20:56:16 +0000
commita33a2562c19aebee0aea1a4fb3c555e6d34b573f (patch)
tree57f3c8920a38ee88e6bf7bd68763fac46876fbdb /libavcodec/x86/Makefile
parent14bc1f24858a8e83a59dd61a88bdd2bc65993e2b (diff)
downloadffmpeg-streaming-a33a2562c19aebee0aea1a4fb3c555e6d34b573f.zip
ffmpeg-streaming-a33a2562c19aebee0aea1a4fb3c555e6d34b573f.tar.gz
Rename h264_weight_sse2.asm to h264_weight.asm; add 16x8/8x16/8x4 non-square
biweight code to sse2/ssse3; add sse2 weight code; and use that same code to create mmx2 functions also, so that the inline asm in h264dsp_mmx.c can be removed. OK'ed by Jason on IRC. Originally committed as revision 25019 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/Makefile')
-rw-r--r--libavcodec/x86/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index dcfc695..b4e3161 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -10,7 +10,7 @@ YASM-OBJS-$(CONFIG_GPL) += x86/h264_idct_sse2.o \
MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_mmx.o
YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock_sse2.o \
- x86/h264_weight_sse2.o \
+ x86/h264_weight.o \
YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o
MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
OpenPOWER on IntegriCloud