Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
903a2e86
Commit
903a2e86
authored
Apr 24, 2008
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid using reserved __names.
Originally committed as revision 12946 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
ceedda75
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
avformat.h
libavformat/avformat.h
+3
-3
cutils.c
libavformat/cutils.c
+1
-1
No files found.
libavformat/avformat.h
View file @
903a2e86
...
...
@@ -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
...
...
libavformat/cutils.c
View file @
903a2e86
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment