diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-01-10 12:53:07 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-01-10 12:53:07 +0000 |
| commit | d2a9bdddd8358f6be94bfd891d026fac82cbbcbf (patch) | |
| tree | d12f915821714b3aff93836460f2483cb2c46223 | |
| parent | d94728c37728f747baf903f7c96850f8dd040e67 (diff) | |
more sane inttypes emulation behavior if libavcodec is used outside ffmpeg
Originally committed as revision 2685 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/common.h | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -985,8 +985,8 @@ if test "$bigendian" = "yes" ; then echo "WORDS_BIGENDIAN=yes" >> config.mak echo "#define WORDS_BIGENDIAN 1" >> $TMPH fi -if test "$inttypes" = "yes" ; then - echo "#define HAVE_INTTYPES_H 1" >> $TMPH +if test "$inttypes" != "yes" ; then + echo "#define EMULATE_INTTYPES 1" >> $TMPH fi if test "$emu_fast_int" = "yes" ; then echo "#define EMULATE_FAST_INT 1" >> $TMPH diff --git a/libavcodec/common.h b/libavcodec/common.h index ee5a4cbd82..e0e90225c0 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -82,7 +82,7 @@ extern const struct AVOption avoptions_workaround_bug[11]; # define always_inline inline #endif -#ifdef HAVE_INTTYPES_H +#ifndef EMULATE_INTTYPES # include <inttypes.h> #else typedef signed char int8_t; |