Mercurial > libavformat.hg
changeset 5946:28ca2d77f997 libavformat
Move the internal function declarations in avformat.h to internal.h.
| author | stefano |
|---|---|
| date | Sun, 11 Apr 2010 21:44:23 +0000 |
| parents | 0abde6943674 |
| children | 8b59caee931c |
| files | avformat.h cutils.c internal.h matroskadec.c mpegtsenc.c |
| diffstat | 5 files changed, 25 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Sun Apr 11 12:21:30 2010 +0000 +++ b/avformat.h Sun Apr 11 21:44:23 2010 +0000 @@ -1337,30 +1337,4 @@ */ int av_match_ext(const char *filename, const char *extensions); -#ifdef HAVE_AV_CONFIG_H - -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);\ -} while(0) -#else -#define dynarray_add(tab, nb_ptr, elem)\ -do {\ - ff_dynarray_add((intptr_t **)(tab), nb_ptr, (intptr_t)(elem));\ -} while(0) -#endif - -time_t mktimegm(struct tm *tm); -struct tm *brktimegm(time_t secs, struct tm *tm); -const char *small_strptime(const char *p, const char *fmt, - struct tm *dt); - -#endif /* HAVE_AV_CONFIG_H */ - #endif /* AVFORMAT_AVFORMAT_H */
--- a/cutils.c Sun Apr 11 12:21:30 2010 +0000 +++ b/cutils.c Sun Apr 11 21:44:23 2010 +0000 @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #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)
--- a/internal.h Sun Apr 11 12:21:30 2010 +0000 +++ b/internal.h Sun Apr 11 21:44:23 2010 +0000 @@ -24,6 +24,28 @@ #include <stdint.h> #include "avformat.h" +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);\ +} while(0) +#else +#define dynarray_add(tab, nb_ptr, elem)\ +do {\ + ff_dynarray_add((intptr_t **)(tab), nb_ptr, (intptr_t)(elem));\ +} while(0) +#endif + +time_t mktimegm(struct tm *tm); +struct tm *brktimegm(time_t secs, struct tm *tm); +const char *small_strptime(const char *p, const char *fmt, + struct tm *dt); + char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase); void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);