[FFmpeg-devel] [PATCH] Move the internal function declarations in avformat.h to internal.h.

[Stefano Sabatini]

---
 libavformat/avformat.h    |   26 --------------------------
 libavformat/cutils.c      |    1 +
 libavformat/internal.h    |   22 ++++++++++++++++++++++
 libavformat/matroskadec.c |    1 +
 libavformat/mpegtsenc.c   |    1 +
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 7cc059c..5ff08c0 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -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);
 
-#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 --git a/libavformat/cutils.c b/libavformat/cutils.c
index 4967d5b..5092d99 100644
--- a/libavformat/cutils.c
+++ b/libavformat/cutils.c
@@ -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 --git a/libavformat/internal.h b/libavformat/internal.h
index 822b7c6..7899880 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -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);
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 8a4ae4e..b6b30e8 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include "avformat.h"
+#include "internal.h"
 /* For ff_codec_get_id(). */
 #include "riff.h"
 #include "isom.h"
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index f05e331..3fc6dc1 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -23,6 +23,7 @@
 #include "libavutil/crc.h"
 #include "libavcodec/mpegvideo.h"
 #include "avformat.h"
+#include "internal.h"
 #include "mpegts.h"
 #include "adts.h"
 
-- 
1.7.0