Browse Source

added proper memory handling functions - fixed include paths

Originally committed as revision 516 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Fabrice Bellard 23 years ago
parent
commit
44f27b3a86
1 changed files with 7 additions and 3 deletions
  1. +7
    -3
      libavcodec/common.h

+ 7
- 3
libavcodec/common.h View File

@@ -17,18 +17,19 @@


#ifdef HAVE_AV_CONFIG_H #ifdef HAVE_AV_CONFIG_H
/* only include the following when compiling package */ /* only include the following when compiling package */
#include "../config.h"
#include "config.h"


#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <math.h>


#ifndef ENODATA #ifndef ENODATA
#define ENODATA 61 #define ENODATA 61
#endif #endif


#endif
#endif /* HAVE_AV_CONFIG_H */


#ifdef CONFIG_WIN32 #ifdef CONFIG_WIN32


@@ -121,7 +122,7 @@ typedef signed long long INT64;
#define UINT64_C(c) (c ## ULL) #define UINT64_C(c) (c ## ULL)
#endif #endif


#include "../bswap.h"
#include "bswap.h"


#ifdef USE_FASTMEMCPY #ifdef USE_FASTMEMCPY
#include "fastmemcpy.h" #include "fastmemcpy.h"
@@ -897,7 +898,10 @@ static inline int clip(int a, int amin, int amax)
} }


/* memory */ /* memory */
void *av_malloc(int size);
void *av_mallocz(int size); void *av_mallocz(int size);
void av_free(void *ptr);
#define av_freep(p) do { av_free(*p); *p = NULL; } while (0)


/* math */ /* math */
int ff_gcd(int a, int b); int ff_gcd(int a, int b);


Loading…
Cancel
Save