Originally committed as revision 5784 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -8,7 +8,7 @@ include ../config.mak | |||||
| CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil \ | CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil \ | ||||
| -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE $(AMR_CFLAGS) | -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE $(AMR_CFLAGS) | ||||
| OBJS= bitstream.o utils.o mem.o allcodecs.o \ | |||||
| OBJS= bitstream.o utils.o allcodecs.o \ | |||||
| mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ | mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ | ||||
| mjpeg.o resample.o resample2.o dsputil.o \ | mjpeg.o resample.o resample2.o dsputil.o \ | ||||
| motion_est.o imgconvert.o imgresample.o \ | motion_est.o imgconvert.o imgresample.o \ | ||||
| @@ -2597,10 +2597,7 @@ extern AVBitStreamFilter noise_bsf; | |||||
| /* memory */ | /* memory */ | ||||
| void *av_malloc(unsigned int size); | |||||
| void *av_mallocz(unsigned int size); | void *av_mallocz(unsigned int size); | ||||
| void *av_realloc(void *ptr, unsigned int size); | |||||
| void av_free(void *ptr); | |||||
| char *av_strdup(const char *s); | char *av_strdup(const char *s); | ||||
| void av_freep(void *ptr); | void av_freep(void *ptr); | ||||
| void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size); | void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size); | ||||
| @@ -14,7 +14,8 @@ OBJS= mathematics.o \ | |||||
| md5.o \ | md5.o \ | ||||
| lls.o \ | lls.o \ | ||||
| adler32.o \ | adler32.o \ | ||||
| log.o | |||||
| log.o \ | |||||
| mem.o \ | |||||
| HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ | HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ | ||||
| intfloat_readwrite.h md5.h adler32.h | intfloat_readwrite.h md5.h adler32.h | ||||
| @@ -355,4 +355,9 @@ tend= read_time();\ | |||||
| #define STOP_TIMER(id) {} | #define STOP_TIMER(id) {} | ||||
| #endif | #endif | ||||
| /* memory */ | |||||
| void *av_malloc(unsigned int size); | |||||
| void *av_realloc(void *ptr, unsigned int size); | |||||
| void av_free(void *ptr); | |||||
| #endif /* COMMON_H */ | #endif /* COMMON_H */ | ||||
| @@ -1,5 +1,5 @@ | |||||
| /* | /* | ||||
| * default memory allocator for libavcodec | |||||
| * default memory allocator for libavutil | |||||
| * Copyright (c) 2002 Fabrice Bellard. | * Copyright (c) 2002 Fabrice Bellard. | ||||
| * | * | ||||
| * This library is free software; you can redistribute it and/or | * This library is free software; you can redistribute it and/or | ||||
| @@ -19,10 +19,10 @@ | |||||
| /** | /** | ||||
| * @file mem.c | * @file mem.c | ||||
| * default memory allocator for libavcodec. | |||||
| * default memory allocator for libavutil. | |||||
| */ | */ | ||||
| #include "avcodec.h" | |||||
| #include "common.h" | |||||
| /* here we can use OS dependant allocation functions */ | /* here we can use OS dependant allocation functions */ | ||||
| #undef malloc | #undef malloc | ||||