[FFmpeg-cvslog] r12946 - in trunk/libavformat: avformat.h cutils.c
michael
subversion
Fri Apr 25 01:21:58 CEST 2008
Author: michael
Date: Fri Apr 25 01:21:58 2008
New Revision: 12946
Log:
Avoid using reserved __names.
Modified:
trunk/libavformat/avformat.h
trunk/libavformat/cutils.c
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h (original)
+++ trunk/libavformat/avformat.h Fri Apr 25 01:21:58 2008
@@ -983,7 +983,7 @@ int avf_sdp_create(AVFormatContext *ac[]
#ifdef HAVE_AV_CONFIG_H
-void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem);
+void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem);
#ifdef __GNUC__
#define dynarray_add(tab, nb_ptr, elem)\
@@ -991,12 +991,12 @@ do {\
typeof(tab) _tab = (tab);\
typeof(elem) _elem = (elem);\
(void)sizeof(**_tab == _elem); /* check that types are compatible */\
- __dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\
+ ff_dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\
} while(0)
#else
#define dynarray_add(tab, nb_ptr, elem)\
do {\
- __dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\
+ ff_dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\
} while(0)
#endif
Modified: trunk/libavformat/cutils.c
==============================================================================
--- trunk/libavformat/cutils.c (original)
+++ trunk/libavformat/cutils.c Fri Apr 25 01:21:58 2008
@@ -21,7 +21,7 @@
#include "avformat.h"
/* add one element to a dynamic array */
-void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem)
+void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem)
{
int nb, nb_alloc;
unsigned long *tab;
More information about the ffmpeg-cvslog
mailing list