Browse code

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

Baptiste Coudurier authored on 2009/02/09 06:14:46
Showing 4 changed files
... ...
@@ -23,6 +23,7 @@
23 23
 #include "libavutil/fifo.h"
24 24
 #include "avformat.h"
25 25
 #include "audiointerleave.h"
26
+#include "internal.h"
26 27
 
27 28
 void ff_audio_interleave_close(AVFormatContext *s)
28 29
 {
... ...
@@ -1116,16 +1116,6 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
1116 1116
                                  AVPacket *pkt, int flush);
1117 1117
 
1118 1118
 /**
1119
- * Add packet to AVFormatContext->packet_buffer list, determining its
1120
- * interleaved position using compare() function argument.
1121
- *
1122
- * This function is not part of the public API and should only be called
1123
- * by muxers using their own interleave function.
1124
- */
1125
-void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
1126
-                              int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
1127
-
1128
-/**
1129 1119
  * @brief Write the stream trailer to an output media file and
1130 1120
  *        free the file private data.
1131 1121
  *
... ...
@@ -29,4 +29,14 @@ char *ff_data_to_hex(char *buf, const uint8_t *src, int size);
29 29
 void av_set_program_name(AVProgram *program, char *provider_name, char *name);
30 30
 void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
31 31
 
32
+/**
33
+ * Add packet to AVFormatContext->packet_buffer list, determining its
34
+ * interleaved position using compare() function argument.
35
+ *
36
+ * This function is not part of the public API and should only be called
37
+ * by muxers using their own interleave function.
38
+ */
39
+void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
40
+                              int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
41
+
32 42
 #endif /* AVFORMAT_INTERNAL_H */
... ...
@@ -23,6 +23,7 @@
23 23
 #include "libavcodec/xiph.h"
24 24
 #include "libavcodec/bytestream.h"
25 25
 #include "avformat.h"
26
+#include "internal.h"
26 27
 
27 28
 typedef struct {
28 29
     int64_t duration;