From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 24 Apr 2008 23:21:58 +0000 (+0000)
Subject: Avoid using reserved __names.
X-Git-Tag: v0.5~4991
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=903a2e8628714a900383fab972630874ecdde4f1;p=coroid%2Fffmpeg_saccubus.git

Avoid using reserved __names.

Originally committed as revision 12946 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 3c20e64ce..3c67bdb5b 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 06c941112..32887c4bc 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;