changeset 488:90227eb98bf9 libavcodec

do not export internal functions - use stdint.h
author bellard
date Tue, 11 Jun 2002 13:38:54 +0000
parents cee02f2f4a5a
children b9fcdf9f4420
files common.h
diffstat 1 files changed, 6 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/common.h	Sun Jun 09 14:04:36 2002 +0000
+++ b/common.h	Tue Jun 11 13:38:54 2002 +0000
@@ -77,7 +77,7 @@
 
 /* unix */
 
-#include <inttypes.h>
+#include <stdint.h>
 
 #ifndef __WINE_WINDEF16_H
 /* workaround for typedef conflict in MPlayer (wine typedefs) */
@@ -111,9 +111,9 @@
 
 #endif /* !CONFIG_WIN32 */
 
-#include "bswap.h"
+#ifdef HAVE_AV_CONFIG_H
 
-#ifdef HAVE_AV_CONFIG_H
+#include "bswap.h"
 
 #if defined(__MINGW32__) || defined(__CYGWIN__) || \
     defined(__OS2__) || defined (__OpenBSD__)
@@ -144,8 +144,6 @@
 
 #endif /* !CONFIG_WIN32 */
 
-#endif /* HAVE_AV_CONFIG_H */
-
 #define av_abort()      do { fprintf(stderr, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)
 
 /* assume b>0 */
@@ -888,13 +886,6 @@
         return a;
 }
 
-/* memory */
-void *av_malloc(int size);
-void *av_mallocz(int size);
-void av_free(void *ptr);
-void __av_freep(void **ptr);
-#define av_freep(p) __av_freep((void **)(p))
-
 /* math */
 int ff_gcd(int a, int b);
 
@@ -934,4 +925,6 @@
 
 #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d)
 
-#endif
+#endif /* HAVE_AV_CONFIG_H */
+
+#endif /* COMMON_H */