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

kill 3 more av_mallocz_static()

Browse Source 
Originally committed as revision 8397 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-03-14 01:59:53 +00:00
parent 9608652dc1
commit 08cb195020
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/utils.c
View File

@ -1189,9 +1189,11 @@ unsigned avcodec_build( void )
} }
static void init_crcs(void){ static void init_crcs(void){
#if LIBAVUTIL_VERSION_INT < (50<<16)
av_crc04C11DB7= av_mallocz_static(sizeof(AVCRC) * 257); av_crc04C11DB7= av_mallocz_static(sizeof(AVCRC) * 257);
av_crc8005 = av_mallocz_static(sizeof(AVCRC) * 257); av_crc8005 = av_mallocz_static(sizeof(AVCRC) * 257);
av_crc07 = av_mallocz_static(sizeof(AVCRC) * 257); av_crc07 = av_mallocz_static(sizeof(AVCRC) * 257);
#endif
av_crc_init(av_crc04C11DB7, 0, 32, 0x04c11db7, sizeof(AVCRC)*257); av_crc_init(av_crc04C11DB7, 0, 32, 0x04c11db7, sizeof(AVCRC)*257);
av_crc_init(av_crc8005 , 0, 16, 0x8005 , sizeof(AVCRC)*257); av_crc_init(av_crc8005 , 0, 16, 0x8005 , sizeof(AVCRC)*257);
av_crc_init(av_crc07 , 0, 8, 0x07 , sizeof(AVCRC)*257); av_crc_init(av_crc07 , 0, 8, 0x07 , sizeof(AVCRC)*257);

7
libavutil/crc.c
View File

@ -21,10 +21,17 @@
#include "common.h" #include "common.h"
#include "crc.h" #include "crc.h"
#if LIBAVUTIL_VERSION_INT < (50<<16)
AVCRC *av_crcEDB88320; AVCRC *av_crcEDB88320;
AVCRC *av_crc04C11DB7; AVCRC *av_crc04C11DB7;
AVCRC *av_crc8005 ; AVCRC *av_crc8005 ;
AVCRC *av_crc07 ; AVCRC *av_crc07 ;
#else
AVCRC av_crcEDB88320[257];
AVCRC av_crc04C11DB7[257];
AVCRC av_crc8005 [257];
AVCRC av_crc07 [257];
#endif
/** /**
* Inits a crc table. * Inits a crc table.

7
libavutil/crc.h
View File

@ -23,10 +23,17 @@
typedef uint32_t AVCRC; typedef uint32_t AVCRC;
#if LIBAVUTIL_VERSION_INT < (50<<16)
extern AVCRC *av_crcEDB88320; extern AVCRC *av_crcEDB88320;
extern AVCRC *av_crc04C11DB7; extern AVCRC *av_crc04C11DB7;
extern AVCRC *av_crc8005 ; extern AVCRC *av_crc8005 ;
extern AVCRC *av_crc07 ; extern AVCRC *av_crc07 ;
#else
extern AVCRC av_crcEDB88320[];
extern AVCRC av_crc04C11DB7[];
extern AVCRC av_crc8005 [];
extern AVCRC av_crc07 [];
#endif
int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size); int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length); uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length);