# HG changeset patch # User takis # Date 1172171144 0 # Node ID f0138063c56808f1fb4a51e1137382fdc474bf17 # Parent 1cb0cac7b19dfe08668dec6119132dc8719997ff Move the Doxygen function documentation unaltered from libavcodec/utils.c to libavcodec/avcodec.h. diff -r 1cb0cac7b19d -r f0138063c568 avcodec.h --- a/avcodec.h Thu Feb 22 18:59:05 2007 +0000 +++ b/avcodec.h Thu Feb 22 19:05:44 2007 +0000 @@ -2700,6 +2700,10 @@ int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, uint8_t *buf, int buf_size); + +/* decode a subtitle message. return -1 if error, otherwise return the + *number of bytes used. If no subtitle could be decompressed, + *got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */ int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, const uint8_t *buf, int buf_size); @@ -2750,6 +2754,9 @@ void avcodec_register_all(void); +/** + * Flush buffers, should be called when seeking or when switching to a different stream. + */ void avcodec_flush_buffers(AVCodecContext *avctx); void avcodec_default_free_buffers(AVCodecContext *s); @@ -2876,11 +2883,28 @@ /* memory */ + +/** + * realloc which does nothing if the block is large enough + */ void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size); + /* for static data only */ -/* call av_free_static to release all staticaly allocated tables */ + +/** + * free all static arrays and reset pointers to 0. + * call av_free_static to release all staticaly allocated tables + */ void av_free_static(void); + +/** + * allocation of static arrays - do not use for normal allocation. + */ void *av_mallocz_static(unsigned int size); + +/** + * same as above, but does realloc + */ void *av_realloc_static(void *ptr, unsigned int size); void img_copy(AVPicture *dst, const AVPicture *src, diff -r 1cb0cac7b19d -r f0138063c568 utils.c --- a/utils.c Thu Feb 22 18:59:05 2007 +0000 +++ b/utils.c Thu Feb 22 19:05:44 2007 +0000 @@ -59,9 +59,6 @@ static int volatile entangled_thread_counter=0; -/** - * realloc which does nothing if the block is large enough - */ void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size) { if(min_size < *size) @@ -76,9 +73,6 @@ static unsigned int allocated_static = 0; static void** array_static = NULL; -/** - * allocation of static arrays - do not use for normal allocation. - */ void *av_mallocz_static(unsigned int size) { void *ptr = av_mallocz(size); @@ -93,10 +87,6 @@ return ptr; } -/** - * same as above, but does realloc - */ - void *av_realloc_static(void *ptr, unsigned int size) { int i; @@ -113,9 +103,6 @@ } -/** - * free all static arrays and reset pointers to 0. - */ void av_free_static(void) { while(last_static){ @@ -938,10 +925,6 @@ } #endif - -/* decode a subtitle message. return -1 if error, otherwise return the - *number of bytes used. If no subtitle could be decompressed, - *got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */ int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, const uint8_t *buf, int buf_size) @@ -1206,9 +1189,6 @@ init_crcs(); } -/** - * Flush buffers, should be called when seeking or when switching to a different stream. - */ void avcodec_flush_buffers(AVCodecContext *avctx) { if(avctx->codec->flush)