virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Revert addition of '#undef av_always_inline' to config.h in the small case.

Browse Source 
Instead, #include config.h at the top of common.h so that av_always_inline
does not get doubly defined.

Originally committed as revision 19553 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-07-30 21:58:43 +00:00
parent 1e1a0b1845
commit 75af07495a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -2655,7 +2655,6 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \
echo "#define restrict $_restrict" >> $TMPH
if enabled small; then
echo "#undef av_always_inline" >> $TMPH
echo "#define av_always_inline" >> $TMPH
fi

5
libavutil/common.h
View File

@ -35,6 +35,10 @@
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_AV_CONFIG_H
#include "config.h"
#endif
#ifdef __GNUC__
# define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
#else
@ -280,7 +284,6 @@ static inline av_const float av_clipf(float a, float amin, float amax)
#include "mem.h"
#ifdef HAVE_AV_CONFIG_H
# include "config.h"
# include "internal.h"
#endif /* HAVE_AV_CONFIG_H */