[vlc-commits] Move libavutil define to avcommon.h

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Oct 28 18:12:07 2012 +0100| [00dba0cc551a856aa31f67d73133ea4f12172158] | committer: Rafaël Carré

Move libavutil define to avcommon.h

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

 modules/codec/avcodec/avcodec.h  |    4 ----
 modules/codec/avcodec/avcommon.h |    6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 8eb2d4d..d388957 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -307,10 +307,6 @@ 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/avcommon.h b/modules/codec/avcodec/avcommon.h
index f84042e..c1da55d 100644
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * avinit.h: common code for libav* initialization
+ * avcommon.h: common code for libav*
  *****************************************************************************
  * Copyright (C) 2012 the VideoLAN team
  * $Id$
@@ -68,6 +68,10 @@ static inline void vlc_init_avcodec(void)
 # include <libavutil/avutil.h>
 # include <libavutil/dict.h>
 
+#if LIBAVUTIL_VERSION_MAJOR < 52 && !defined(AV_CPU_FLAG_MMXEXT)
+#   define AV_CPU_FLAG_MMXEXT       AV_CPU_FLAG_MMX2
+#endif
+
 #define AV_OPTIONS_TEXT     "Advanced options."
 #define AV_OPTIONS_LONGTEXT "Advanced options, in the form {opt=val,opt2=val2} ."