[FFmpeg-cvslog] r22843 - in trunk/libavformat: avformat.h cutils.c internal.h matroskadec.c mpegtsenc.c

[stefano]

Author: stefano
Date: Sun Apr 11 23:44:23 2010
New Revision: 22843

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

Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/cutils.c
   trunk/libavformat/internal.h
   trunk/libavformat/matroskadec.c
   trunk/libavformat/mpegtsenc.c

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Sun Apr 11 23:26:00 2010	(r22842)
+++ trunk/libavformat/avformat.h	Sun Apr 11 23:44:23 2010	(r22843)
@@ -1337,30 +1337,4 @@ int avf_sdp_create(AVFormatContext *ac[]
  */
 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 */

Modified: trunk/libavformat/cutils.c
==============================================================================
--- trunk/libavformat/cutils.c	Sun Apr 11 23:26:00 2010	(r22842)
+++ trunk/libavformat/cutils.c	Sun Apr 11 23:44:23 2010	(r22843)
@@ -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)

Modified: trunk/libavformat/internal.h
==============================================================================
--- trunk/libavformat/internal.h	Sun Apr 11 23:26:00 2010	(r22842)
+++ trunk/libavformat/internal.h	Sun Apr 11 23:44:23 2010	(r22843)
@@ -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);

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	Sun Apr 11 23:26:00 2010	(r22842)
+++ trunk/libavformat/matroskadec.c	Sun Apr 11 23:44:23 2010	(r22843)
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include "avformat.h"
+#include "internal.h"
 /* For ff_codec_get_id(). */
 #include "riff.h"
 #include "isom.h"

Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c	Sun Apr 11 23:26:00 2010	(r22842)
+++ trunk/libavformat/mpegtsenc.c	Sun Apr 11 23:44:23 2010	(r22843)
@@ -23,6 +23,7 @@
 #include "libavutil/crc.h"
 #include "libavcodec/mpegvideo.h"
 #include "avformat.h"
+#include "internal.h"
 #include "mpegts.h"
 #include "adts.h"