aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libavformat/avformat.h25
-rw-r--r--libavformat/ffmetadec.c1
-rw-r--r--libavformat/internal.h21
-rw-r--r--libavformat/mpeg.c1
-rw-r--r--libavformat/oggparsevorbis.c1
5 files changed, 24 insertions, 25 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index e1b753e3f4..66b220f599 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1251,22 +1251,6 @@ AVStream *av_new_stream(AVFormatContext *s, int id);
AVProgram *av_new_program(AVFormatContext *s, int id);
/**
- * Add a new chapter.
- * This function is NOT part of the public API
- * and should ONLY be used by demuxers.
- *
- * @param s media file handle
- * @param id unique ID for this chapter
- * @param start chapter start time in time_base units
- * @param end chapter end time in time_base units
- * @param title chapter title
- *
- * @return AVChapter or NULL on error
- */
-AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
- int64_t start, int64_t end, const char *title);
-
-/**
* Set the pts for a given stream. If the new values would be invalid
* (<= 0), it leaves the AVStream unchanged.
*
@@ -1297,15 +1281,6 @@ int av_find_default_stream_index(AVFormatContext *s);
int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
/**
- * Ensure the index uses less memory than the maximum specified in
- * AVFormatContext.max_index_size by discarding entries if it grows
- * too large.
- * This function is not part of the public API and should only be called
- * by demuxers.
- */
-void ff_reduce_index(AVFormatContext *s, int stream_index);
-
-/**
* Add an index entry into a sorted list. Update the entry if the list
* already contains it.
*
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c
index ab35746efc..cfeed7353c 100644
--- a/libavformat/ffmetadec.c
+++ b/libavformat/ffmetadec.c
@@ -21,6 +21,7 @@
#include "avformat.h"
#include "ffmeta.h"
+#include "internal.h"
static int probe(AVProbeData *p)
{
diff --git a/libavformat/internal.h b/libavformat/internal.h
index e53da7d46d..9e3302fa5f 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -240,4 +240,25 @@ int ff_add_index_entry(AVIndexEntry **index_entries,
unsigned int *index_entries_allocated_size,
int64_t pos, int64_t timestamp, int size, int distance, int flags);
+/**
+ * Add a new chapter.
+ *
+ * @param s media file handle
+ * @param id unique ID for this chapter
+ * @param start chapter start time in time_base units
+ * @param end chapter end time in time_base units
+ * @param title chapter title
+ *
+ * @return AVChapter or NULL on error
+ */
+AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
+ int64_t start, int64_t end, const char *title);
+
+/**
+ * Ensure the index uses less memory than the maximum specified in
+ * AVFormatContext.max_index_size by discarding entries if it grows
+ * too large.
+ */
+void ff_reduce_index(AVFormatContext *s, int stream_index);
+
#endif /* AVFORMAT_INTERNAL_H */
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 135482b7c8..2df7a154f8 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -20,6 +20,7 @@
*/
#include "avformat.h"
+#include "internal.h"
#include "mpeg.h"
//#define DEBUG_SEEK
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index b915fffb03..830f0bca37 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -28,6 +28,7 @@
#include "libavcodec/get_bits.h"
#include "libavcodec/bytestream.h"
#include "avformat.h"
+#include "internal.h"
#include "oggdec.h"
#include "vorbiscomment.h"