summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-06-28 21:12:00 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-06-28 21:12:00 +0000
commit50f70541d36b3ff477b63b3ec754e28ace824d8e (patch)
tree9c57c11488553c74e39cd1ffb08b8044da5c2661
parent2209ffacb974db22c8798a9ca9f3754efec41bc4 (diff)
Change MMXEXT to MMX2, MMXEXT is deprecated
Originally committed as revision 23865 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/x86/h264dsp_mmx.c2
-rw-r--r--libavcodec/x86/vp8dsp-init.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c
index 6c5255059b..3ff100b54e 100644
--- a/libavcodec/x86/h264dsp_mmx.c
+++ b/libavcodec/x86/h264dsp_mmx.c
@@ -2364,7 +2364,7 @@ void ff_h264_pred_init_x86(H264PredContext *h, int codec_id)
}
}
- if (mm_flags & FF_MM_MMXEXT) {
+ if (mm_flags & FF_MM_MMX2) {
h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_mmxext;
h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_mmxext;
h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_mmxext;
diff --git a/libavcodec/x86/vp8dsp-init.c b/libavcodec/x86/vp8dsp-init.c
index 308651d80a..7bb97ae3f8 100644
--- a/libavcodec/x86/vp8dsp-init.c
+++ b/libavcodec/x86/vp8dsp-init.c
@@ -236,7 +236,7 @@ av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c)
/* note that 4-tap width=16 functions are missing because w=16
* is only used for luma, and luma is always a copy or sixtap. */
- if (mm_flags & FF_MM_MMXEXT) {
+ if (mm_flags & FF_MM_MMX2) {
VP8_LUMA_MC_FUNC(0, 16, mmxext);
VP8_MC_FUNC(1, 8, mmxext);
VP8_MC_FUNC(1, 4, mmxext);