Move declaration of ff_interleave_add_packet to internal.h.

It is an internal function and should not be in an installed header.

Originally committed as revision 17070 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c
index fac68d0..31e59cf 100644 (file)
--- a/libavformat/audiointerleave.c
+++ b/libavformat/audiointerleave.c
@@ -23,6 +23,7 @@
 #include "libavutil/fifo.h"
 #include "avformat.h"
 #include "audiointerleave.h"
+#include "internal.h"
 
 void ff_audio_interleave_close(AVFormatContext *s)
 {

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 0dc1d20..0dc3313 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1116,16 +1116,6 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
                                  AVPacket *pkt, int flush);
 
 /**
- * Add packet to AVFormatContext->packet_buffer list, determining its
- * interleaved position using compare() function argument.
- *
- * This function is not part of the public API and should only be called
- * by muxers using their own interleave function.
- */
-void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
-                              int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
-
-/**
  * @brief Write the stream trailer to an output media file and
  *        free the file private data.
  *

diff --git a/libavformat/internal.h b/libavformat/internal.h
index cb266ca..997154f 100644 (file)
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -29,4 +29,14 @@ char *ff_data_to_hex(char *buf, const uint8_t *src, int size);
 void av_set_program_name(AVProgram *program, char *provider_name, char *name);
 void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
 
+/**
+ * Add packet to AVFormatContext->packet_buffer list, determining its
+ * interleaved position using compare() function argument.
+ *
+ * This function is not part of the public API and should only be called
+ * by muxers using their own interleave function.
+ */
+void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
+                              int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
+
 #endif /* AVFORMAT_INTERNAL_H */

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 1e2a93a..4fdae05 100644 (file)
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -23,6 +23,7 @@
 #include "libavcodec/xiph.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
+#include "internal.h"
 
 typedef struct {
     int64_t duration;