diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-01 00:21:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-01 00:26:05 +0200 |
| commit | ffb5a0d533498102c31aa131bc91a4cce868b0a8 (patch) | |
| tree | 1c78494488bab5bafa3bda2ab20295f13860fc2e /libavformat/internal.h | |
| parent | 1a9f9f81b1244b952126bb65bc741b04d3534f81 (diff) | |
| parent | 85770f2a2651497861ed938efcd0df3696ff5e45 (diff) | |
Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'
* commit '85770f2a2651497861ed938efcd0df3696ff5e45':
AVOptions: make default_val a union, as proposed in AVOption2.
Move ff_dynarray_add to lavu and make it public.
lavf: remove duplicate assignment in avformat_alloc_context.
lavf: use designated initializers for AVClasses.
options: simplify av_find_opt by using av_next_option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index d78a57e2e4..b8b520d0e2 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -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 |