[vlc-commits] avcodec: AV_CPU_FLAG_MMX2 was removed

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Oct 28 17:50:19 2012 +0100| [635abd7fecca5ba6628dc873e70f891affe9bc44] | committer: Rafaël Carré

avcodec: AV_CPU_FLAG_MMX2 was removed

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=635abd7fecca5ba6628dc873e70f891affe9bc44
---

 modules/codec/avcodec/avcodec.h |    4 ++++
 modules/codec/avcodec/cpu.c     |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index d388957..8eb2d4d 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -307,6 +307,10 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
 #   define AV_CPU_FLAG_ALTIVEC     FF_MM_ALTIVEC
 #endif
 
+#if LIBAVUTIL_VERSION_MAJOR < 52 && !defined(AV_CPU_FLAG_MMXEXT)
+#   define AV_CPU_FLAG_MMXEXT       AV_CPU_FLAG_MMX2
+#endif
+
 #if LIBAVCODEC_VERSION_MAJOR < 54
 #   define AV_PICTURE_TYPE_B        FF_B_TYPE
 #   define AV_PICTURE_TYPE_I        FF_I_TYPE
diff --git a/modules/codec/avcodec/cpu.c b/modules/codec/avcodec/cpu.c
index bfd1c20..918daf5 100644
--- a/modules/codec/avcodec/cpu.c
+++ b/modules/codec/avcodec/cpu.c
@@ -40,7 +40,7 @@ unsigned GetVlcDspMask( void )
     if( !vlc_CPU_MMX() )
         mask |= AV_CPU_FLAG_MMX;
     if( !vlc_CPU_MMXEXT() )
-        mask |= AV_CPU_FLAG_MMX2;
+        mask |= AV_CPU_FLAG_MMXEXT;
     if( !vlc_CPU_3dNOW() )
         mask |= AV_CPU_FLAG_3DNOW;
     if( !vlc_CPU_SSE() )