Commit b9c83887 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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.

Originally committed as revision 13571 to svn://
parent 83422c19
......@@ -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);
array_static =av_fast_realloc(array_static, &allocated_static, sizeof(void*)*(last_static+1));
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;
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