diff options
author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 12:56:26 +0000 |
---|---|---|
committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 12:56:26 +0000 |
commit | 508e12f9c4bd813afdf37024798822b82ec26b68 (patch) | |
tree | 54f495cfb091cbd94eb27dbf6072b18bd01e2ff3 /src/libffmpeg/libavutil/common.h | |
parent | dcdfd0d3e5956b5f18359ef50006489a7caa10c4 (diff) | |
download | xine-lib-508e12f9c4bd813afdf37024798822b82ec26b68.tar.gz xine-lib-508e12f9c4bd813afdf37024798822b82ec26b68.tar.bz2 |
small fixes
CVS patchset: 7770
CVS date: 2005/10/23 12:56:26
Diffstat (limited to 'src/libffmpeg/libavutil/common.h')
-rw-r--r-- | src/libffmpeg/libavutil/common.h | 13 |
1 files changed, 13 insertions, 0 deletions
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 */ |