From 508e12f9c4bd813afdf37024798822b82ec26b68 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Sun, 23 Oct 2005 12:56:26 +0000 Subject: small fixes CVS patchset: 7770 CVS date: 2005/10/23 12:56:26 --- src/libffmpeg/libavutil/common.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/libffmpeg/libavutil') diff --git a/src/libffmpeg/libavutil/common.h b/src/libffmpeg/libavutil/common.h index 4bf8cacbe..33fd59518 100644 --- a/src/libffmpeg/libavutil/common.h +++ b/src/libffmpeg/libavutil/common.h @@ -9,6 +9,7 @@ /* xine: disable DEBUG for ffmpeg (too noisy) */ #ifdef DEBUG #undef DEBUG +#define DISABLE_INLINE #endif #if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) @@ -585,4 +586,16 @@ static always_inline long int lrintf(float x) #endif /* HAVE_AV_CONFIG_H */ +/* xine: inline causes trouble for debug compiling */ +#ifdef DISABLE_INLINE +# ifdef inline +# undef inline +# endif +# ifdef always_inline +# undef always_inline +# endif +# define inline +# define always_inline +#endif + #endif /* COMMON_H */ -- cgit v1.2.3