xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 20:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid using reserved __names.

Browse Source 
Originally committed as revision 12946 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-04-24 23:21:58 +00:00
parent ceedda75ea
commit 903a2e8628
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@ -983,7 +983,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
#ifdef HAVE_AV_CONFIG_H #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__ #ifdef __GNUC__
#define dynarray_add(tab, nb_ptr, elem)\ #define dynarray_add(tab, nb_ptr, elem)\
@ -991,12 +991,12 @@ do {\
typeof(tab) _tab = (tab);\ typeof(tab) _tab = (tab);\
typeof(elem) _elem = (elem);\ typeof(elem) _elem = (elem);\
(void)sizeof(**_tab == _elem); /* check that types are compatible */\ (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) } while(0)
#else #else
#define dynarray_add(tab, nb_ptr, elem)\ #define dynarray_add(tab, nb_ptr, elem)\
do {\ do {\
__dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\ ff_dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\
} while(0) } while(0)
#endif #endif

2
libavformat/cutils.c
View File

@ -21,7 +21,7 @@
#include "avformat.h" #include "avformat.h"
/* add one element to a dynamic array */ /* 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; int nb, nb_alloc;
unsigned long *tab; unsigned long *tab;