Mercurial > libavcodec.hg
diff utils.c @ 6941:da73a98945ea libavcodec
Move *_static to bitstream.c which is the only file left which needs
them.
| author | michael |
|---|---|
| date | Fri, 30 May 2008 21:12:33 +0000 |
| parents | f7cbb7733146 |
| children | 92c74bbdf4fb |
line wrap: on
line diff
--- a/utils.c Fri May 30 21:08:41 2008 +0000 +++ b/utils.c Fri May 30 21:12:33 2008 +0000 @@ -73,60 +73,6 @@ return ptr; } -static unsigned int last_static = 0; -static unsigned int allocated_static = 0; -static void** array_static = NULL; - -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; -} - -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; - -} - -void av_free_static(void) -{ - while(last_static){ - av_freep(&array_static[--last_static]); - } - av_freep(&array_static); -} - -/** - * Call av_free_static automatically before it's too late - */ - -static void do_free(void) __attribute__ ((destructor)); - -static void do_free(void) -{ - av_free_static(); -} - - /* encoder management */ AVCodec *first_avcodec = NULL;
