generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: move internal functions from avformat.h to internal.h

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 19711af5cdc364f9e02ea8103dd6e1e09dc288a4)
This commit is contained in:
Anton Khirnov 2011-02-06 15:38:55 +01:00 committed by Michael Niedermayer
parent 2f35beae4d
commit f81946729e
5 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/avformat.h
View File

@ -1250,22 +1250,6 @@ void avformat_free_context(AVFormatContext *s);
AVStream *av_new_stream(AVFormatContext *s, int id); AVStream *av_new_stream(AVFormatContext *s, int id);
AVProgram *av_new_program(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 * Set the pts for a given stream. If the new values would be invalid
* (<= 0), it leaves the AVStream unchanged. * (<= 0), it leaves the AVStream unchanged.
@ -1296,15 +1280,6 @@ int av_find_default_stream_index(AVFormatContext *s);
*/ */
int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags); 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 * Add an index entry into a sorted list. Update the entry if the list
* already contains it. * already contains it.

1
libavformat/ffmetadec.c
View File

@ -21,6 +21,7 @@
#include "avformat.h" #include "avformat.h"
#include "ffmeta.h" #include "ffmeta.h"
#include "internal.h"
static int probe(AVProbeData *p) static int probe(AVProbeData *p)
{ {

21
libavformat/internal.h
View File

@ -240,4 +240,25 @@ int ff_add_index_entry(AVIndexEntry **index_entries,
unsigned int *index_entries_allocated_size, unsigned int *index_entries_allocated_size,
int64_t pos, int64_t timestamp, int size, int distance, int flags); 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 */ #endif /* AVFORMAT_INTERNAL_H */

1
libavformat/mpeg.c
View File

@ -20,6 +20,7 @@
*/ */
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#include "mpeg.h" #include "mpeg.h"
//#define DEBUG_SEEK //#define DEBUG_SEEK

1
libavformat/oggparsevorbis.c
View File

@ -28,6 +28,7 @@
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#include "oggdec.h" #include "oggdec.h"
#include "vorbiscomment.h" #include "vorbiscomment.h"