1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Move the internal function declarations in avformat.h to internal.h.

Originally committed as revision 22843 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-04-11 21:44:23 +00:00
parent bc3c85a3e6
commit 9a2cb05ff9
5 changed files with 25 additions and 26 deletions

View File

@ -1337,30 +1337,4 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
*/ */
int av_match_ext(const char *filename, const char *extensions); 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 */ #endif /* AVFORMAT_AVFORMAT_H */

View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "avformat.h" #include "avformat.h"
#include "internal.h"
/* add one element to a dynamic array */ /* add one element to a dynamic array */
void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem) void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem)

View File

@ -24,6 +24,28 @@
#include <stdint.h> #include <stdint.h>
#include "avformat.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); 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); void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);

View File

@ -30,6 +30,7 @@
#include <stdio.h> #include <stdio.h>
#include "avformat.h" #include "avformat.h"
#include "internal.h"
/* For ff_codec_get_id(). */ /* For ff_codec_get_id(). */
#include "riff.h" #include "riff.h"
#include "isom.h" #include "isom.h"

View File

@ -23,6 +23,7 @@
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavcodec/mpegvideo.h" #include "libavcodec/mpegvideo.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#include "mpegts.h" #include "mpegts.h"
#include "adts.h" #include "adts.h"