mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
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
This commit is contained in:
parent
52ef50a080
commit
1cc65cecb2
@ -23,6 +23,7 @@
|
|||||||
#include "libavutil/fifo.h"
|
#include "libavutil/fifo.h"
|
||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
#include "audiointerleave.h"
|
#include "audiointerleave.h"
|
||||||
|
#include "internal.h"
|
||||||
|
|
||||||
void ff_audio_interleave_close(AVFormatContext *s)
|
void ff_audio_interleave_close(AVFormatContext *s)
|
||||||
{
|
{
|
||||||
|
@ -1115,16 +1115,6 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
|
|||||||
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
|
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
|
||||||
AVPacket *pkt, int flush);
|
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
|
* @brief Write the stream trailer to an output media file and
|
||||||
* free the file private data.
|
* free the file private data.
|
||||||
|
@ -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_set_program_name(AVProgram *program, char *provider_name, char *name);
|
||||||
void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
|
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 */
|
#endif /* AVFORMAT_INTERNAL_H */
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "libavcodec/xiph.h"
|
#include "libavcodec/xiph.h"
|
||||||
#include "libavcodec/bytestream.h"
|
#include "libavcodec/bytestream.h"
|
||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
|
#include "internal.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int64_t duration;
|
int64_t duration;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user