[SCM] libav/experimental: One declaration of mm_flags is enough
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:50:35 UTC 2013
The following commit has been merged in the experimental branch:
commit e78516c6d8c0b5ca42d2eabc5c2e10e38523930c
Author: Måns Rullgård <mans at mansr.com>
Date: Sat Aug 29 16:55:55 2009 +0000
One declaration of mm_flags is enough
Originally committed as revision 19740 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index d029689..104953f 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -598,6 +598,7 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){
/* should be defined by architectures supporting
one or more MultiMedia extension */
int mm_support(void);
+extern int mm_flags;
void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx);
@@ -616,8 +617,6 @@ void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
#undef emms_c
-extern int mm_flags;
-
static inline void emms(void)
{
__asm__ volatile ("emms;":::"memory");
@@ -632,16 +631,12 @@ static inline void emms(void)
#elif ARCH_ARM
-extern int mm_flags;
-
#if HAVE_NEON
# define STRIDE_ALIGN 16
#endif
#elif ARCH_PPC
-extern int mm_flags;
-
#define STRIDE_ALIGN 16
#elif HAVE_MMI
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list