Mercurial > libavformat.hg

diff avformat.h @ 3249:bda0941921fe libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid using reserved __names.
author michael
date Thu, 24 Apr 2008 23:21:58 +0000
parents f016d69a28b6
children 724f338005d4
line wrap: on
line diff
--- a/avformat.h	Thu Apr 24 23:09:28 2008 +0000
+++ b/avformat.h	Thu Apr 24 23:21:58 2008 +0000
@@ -983,7 +983,7 @@
 
 #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 @@
     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