Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
35ceaa73
Commit
35ceaa73
authored
Apr 29, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move ff_dynarray_add to lavu and make it public.
parent
9ac1bf88
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
26 deletions
+36
-26
APIchanges
doc/APIchanges
+4
-0
cutils.c
libavformat/cutils.c
+0
-21
internal.h
libavformat/internal.h
+2
-4
avutil.h
libavutil/avutil.h
+1
-1
mem.c
libavutil/mem.c
+20
-0
mem.h
libavutil/mem.h
+9
-0
No files found.
doc/APIchanges
View file @
35ceaa73
...
...
@@ -13,6 +13,10 @@ libavutil: 2011-04-18
API changes, most recent first:
2011-04-xx - xxxxxxx - lavu 51.2.0 - mem.h
Add av_dynarray_add function for adding
an element to a dynamic array.
2011-04-XX - bebe72f - lavu 51.1.0 - avutil.h
Add AVPictureType enum and av_get_picture_type_char(), deprecate
FF_*_TYPE defines and av_get_pict_type_char() defined in
...
...
libavformat/cutils.c
View file @
35ceaa73
...
...
@@ -21,27 +21,6 @@
#include "avformat.h"
#include "internal.h"
/* add one element to a dynamic array */
void
ff_dynarray_add
(
intptr_t
**
tab_ptr
,
int
*
nb_ptr
,
intptr_t
elem
)
{
/* see similar ffmpeg.c:grow_array() */
int
nb
,
nb_alloc
;
intptr_t
*
tab
;
nb
=
*
nb_ptr
;
tab
=
*
tab_ptr
;
if
((
nb
&
(
nb
-
1
))
==
0
)
{
if
(
nb
==
0
)
nb_alloc
=
1
;
else
nb_alloc
=
nb
*
2
;
tab
=
av_realloc
(
tab
,
nb_alloc
*
sizeof
(
intptr_t
));
*
tab_ptr
=
tab
;
}
tab
[
nb
++
]
=
elem
;
*
nb_ptr
=
nb
;
}
#define ISLEAP(y) (((y) % 4 == 0) && (((y) % 100) != 0 || ((y) % 400) == 0))
#define LEAPS_COUNT(y) ((y)/4 - (y)/100 + (y)/400)
...
...
libavformat/internal.h
View file @
35ceaa73
...
...
@@ -31,20 +31,18 @@ typedef struct AVCodecTag {
unsigned
int
tag
;
}
AVCodecTag
;
void
ff_dynarray_add
(
intptr_t
**
tab_ptr
,
int
*
nb_ptr
,
intptr_t
elem
);
#ifdef __GNUC__
#define dynarray_add(tab, nb_ptr, elem)\
do {\
__typeof__(tab) _tab = (tab);\
__typeof__(elem) _elem = (elem);\
(void)sizeof(**_tab == _elem);
/* check that types are compatible */
\
ff_dynarray_add((intptr_t **)_tab, nb_ptr, (intptr_t)
_elem);\
av_dynarray_add(_tab, nb_ptr,
_elem);\
} while(0)
#else
#define dynarray_add(tab, nb_ptr, elem)\
do {\
ff_dynarray_add((intptr_t **)(tab), nb_ptr, (intptr_t)
(elem));\
av_dynarray_add((tab), nb_ptr,
(elem));\
} while(0)
#endif
...
...
libavutil/avutil.h
View file @
35ceaa73
...
...
@@ -40,7 +40,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 51
#define LIBAVUTIL_VERSION_MINOR
1
#define LIBAVUTIL_VERSION_MINOR
2
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
...
...
libavutil/mem.c
View file @
35ceaa73
...
...
@@ -171,3 +171,23 @@ char *av_strdup(const char *s)
return
ptr
;
}
/* add one element to a dynamic array */
void
av_dynarray_add
(
void
*
tab_ptr
,
int
*
nb_ptr
,
void
*
elem
)
{
/* see similar ffmpeg.c:grow_array() */
int
nb
,
nb_alloc
;
intptr_t
*
tab
;
nb
=
*
nb_ptr
;
tab
=
*
(
intptr_t
**
)
tab_ptr
;
if
((
nb
&
(
nb
-
1
))
==
0
)
{
if
(
nb
==
0
)
nb_alloc
=
1
;
else
nb_alloc
=
nb
*
2
;
tab
=
av_realloc
(
tab
,
nb_alloc
*
sizeof
(
intptr_t
));
*
(
intptr_t
**
)
tab_ptr
=
tab
;
}
tab
[
nb
++
]
=
(
intptr_t
)
elem
;
*
nb_ptr
=
nb
;
}
libavutil/mem.h
View file @
35ceaa73
...
...
@@ -123,4 +123,13 @@ char *av_strdup(const char *s) av_malloc_attrib;
*/
void
av_freep
(
void
*
ptr
);
/**
* Add an element to a dynamic array.
*
* @param tab_ptr Pointer to the array.
* @param nb_ptr Pointer to the number of elements in the array.
* @param elem Element to be added.
*/
void
av_dynarray_add
(
void
*
tab_ptr
,
int
*
nb_ptr
,
void
*
elem
);
#endif
/* AVUTIL_MEM_H */
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