diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-04-24 23:21:58 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-04-24 23:21:58 +0000 |
| commit | 903a2e8628714a900383fab972630874ecdde4f1 (patch) | |
| tree | 5c724405dbdbe9e1e1fb7a8773d802f3b5591ee8 | |
| parent | ceedda75ea8797a06111719ac8f4772a5f090781 (diff) | |
| download | ffmpeg-903a2e8628714a900383fab972630874ecdde4f1.tar.gz | |
Avoid using reserved __names.
Originally committed as revision 12946 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avformat.h | 6 | ||||
| -rw-r--r-- | libavformat/cutils.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 3c20e64ce0..3c67bdb5ba 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -983,7 +983,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size); #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 diff --git a/libavformat/cutils.c b/libavformat/cutils.c index 06c941112f..32887c4bc4 100644 --- a/libavformat/cutils.c +++ b/libavformat/cutils.c @@ -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; |