Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: source/patched-ffmpeg-mt/libavcodec/x86/Makefile

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: source/patched-ffmpeg-mt/libavcodec/x86/Makefile
===================================================================
--- source/patched-ffmpeg-mt/libavcodec/x86/Makefile (revision 59334)
+++ source/patched-ffmpeg-mt/libavcodec/x86/Makefile (working copy)
@@ -8,10 +8,12 @@
$(YASM-OBJS-FFT-yes)
YASM-OBJS-$(CONFIG_GPL) += x86/h264_idct_sse2.o \
-YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock_sse2.o \
- x86/h264_weight_sse2.o \
+MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_mmx.o
+YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \
+ x86/h264_weight.o \
YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o
+MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o
@@ -26,24 +28,22 @@
MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o
MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
-MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o \
- x86/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o \
- x86/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp_mmx.o \
- x86/vp3dsp_sse2.o \
- x86/vp6dsp_mmx.o \
- x86/vp6dsp_sse2.o
+YASM-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp.o
+YASM-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp.o
+MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o
+YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp.o \
+ x86/vp56dsp.o
+MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o
YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o
MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp-init.o
MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \
x86/deinterlace.o \
+ x86/h264_chromamc.o \
$(YASM-OBJS-yes)
MMX-OBJS-$(CONFIG_FFT) += x86/fft.o
-OBJS-$(HAVE_MMX) += x86/cpuid.o \
- x86/dnxhd_mmx.o \
+OBJS-$(HAVE_MMX) += x86/dnxhd_mmx.o \
x86/dsputil_mmx.o \
x86/fdct_mmx.o \
x86/idct_mmx_xvid.o \
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/ws-snd1.c ('k') | source/patched-ffmpeg-mt/libavcodec/x86/cavsdsp_mmx.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698