diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-07-29 22:05:39 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-07-31 10:19:03 -0700 |
| commit | 04da20e58fd78617e9f4afc17ce7d04e4f839b7f (patch) | |
| tree | 3f79420609301882dae9d018a51c399ba750c99d | |
| parent | c9ae8be5a87ce6fc6cd3ddc5ac590c0245dc8928 (diff) | |
dynarray: Change AV_ to FF_ for AV_DYNARRAY_ADD
The header is not installed and the macro isn't used outside libavutil,
so it is obviously privat to libavutil. Make the name reflect that.
| -rw-r--r-- | libavutil/dynarray.h | 2 | ||||
| -rw-r--r-- | libavutil/mem.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/dynarray.h b/libavutil/dynarray.h index 4947d93dc8..034a9fedfe 100644 --- a/libavutil/dynarray.h +++ b/libavutil/dynarray.h @@ -42,7 +42,7 @@ * array and size are not changed; the statement can end * with a return or a goto */ -#define AV_DYNARRAY_ADD(av_size_max, av_elt_size, av_array, av_size, \ +#define FF_DYNARRAY_ADD(av_size_max, av_elt_size, av_array, av_size, \ av_success, av_failure) \ do { \ size_t av_size_new = (av_size); \ diff --git a/libavutil/mem.c b/libavutil/mem.c index 809ec01084..1a8fc21e98 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -312,7 +312,7 @@ int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem) void **tab; memcpy(&tab, tab_ptr, sizeof(tab)); - AV_DYNARRAY_ADD(INT_MAX, sizeof(*tab), tab, *nb_ptr, { + FF_DYNARRAY_ADD(INT_MAX, sizeof(*tab), tab, *nb_ptr, { tab[*nb_ptr] = elem; memcpy(tab_ptr, &tab, sizeof(tab)); }, { @@ -326,7 +326,7 @@ void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem) void **tab; memcpy(&tab, tab_ptr, sizeof(tab)); - AV_DYNARRAY_ADD(INT_MAX, sizeof(*tab), tab, *nb_ptr, { + FF_DYNARRAY_ADD(INT_MAX, sizeof(*tab), tab, *nb_ptr, { tab[*nb_ptr] = elem; memcpy(tab_ptr, &tab, sizeof(tab)); }, { @@ -340,7 +340,7 @@ void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size, { uint8_t *tab_elem_data = NULL; - AV_DYNARRAY_ADD(INT_MAX, elem_size, *tab_ptr, *nb_ptr, { + FF_DYNARRAY_ADD(INT_MAX, elem_size, *tab_ptr, *nb_ptr, { tab_elem_data = (uint8_t *)*tab_ptr + (*nb_ptr) * elem_size; if (elem_data) memcpy(tab_elem_data, elem_data, elem_size); |