Commit 3c31d6ab authored by michael's avatar michael

As *_static are not deallocated anymore except on program termination

we do not need to keep track of them anymore.
Fixes CID117 RUN2 and various race conditions.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13571 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 833f2732
......@@ -42,38 +42,14 @@
attribute_deprecated av_alloc_size(2)
static void *ff_realloc_static(void *ptr, unsigned int size);
static unsigned int last_static = 0;
static unsigned int allocated_static = 0;
static void** array_static = NULL;
static void *av_mallocz_static(unsigned int size)
{
void *ptr = av_mallocz(size);
if(ptr){
array_static =av_fast_realloc(array_static, &allocated_static, sizeof(void*)*(last_static+1));
if(!array_static)
return NULL;
array_static[last_static++] = ptr;
}
return ptr;
return av_mallocz(size);
}
static void *ff_realloc_static(void *ptr, unsigned int size)
{
int i;
if(!ptr)
return av_mallocz_static(size);
/* Look for the old ptr */
for(i = 0; i < last_static; i++) {
if(array_static[i] == ptr) {
array_static[i] = av_realloc(array_static[i], size);
return array_static[i];
}
}
return NULL;
return av_realloc(ptr, size);
}
void align_put_bits(PutBitContext *s)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment