# HG changeset patch # User stefano # Date 1271022263 0 # Node ID 28ca2d77f9970c419cb6b979ca99c87c22ecc4b1 # Parent 0abde694367411c09bfb1905a76ba3ed78f45686 Move the internal function declarations in avformat.h to internal.h. diff -r 0abde6943674 -r 28ca2d77f997 avformat.h --- 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 */ diff -r 0abde6943674 -r 28ca2d77f997 cutils.c --- 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) diff -r 0abde6943674 -r 28ca2d77f997 internal.h --- 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 #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); diff -r 0abde6943674 -r 28ca2d77f997 matroskadec.c --- a/matroskadec.c Sun Apr 11 12:21:30 2010 +0000 +++ b/matroskadec.c Sun Apr 11 21:44:23 2010 +0000 @@ -30,6 +30,7 @@ #include #include "avformat.h" +#include "internal.h" /* For ff_codec_get_id(). */ #include "riff.h" #include "isom.h" diff -r 0abde6943674 -r 28ca2d77f997 mpegtsenc.c --- a/mpegtsenc.c Sun Apr 11 12:21:30 2010 +0000 +++ b/mpegtsenc.c Sun Apr 11 21:44:23 2010 +0000 @@ -23,6 +23,7 @@ #include "libavutil/crc.h" #include "libavcodec/mpegvideo.h" #include "avformat.h" +#include "internal.h" #include "mpegts.h" #include "adts.h"