# HG changeset patch # User bcoudurier # Date 1234127686 0 # Node ID d5119d75439dc82b756961d3024cd869e1e1e3ea # Parent de5ccc7a446123464bc9f74ad4ff26009b316733 Move declaration of ff_interleave_add_packet to internal.h. It is an internal function and should not be in an installed header. diff -r de5ccc7a4461 -r d5119d75439d audiointerleave.c --- a/audiointerleave.c Sun Feb 08 21:09:50 2009 +0000 +++ b/audiointerleave.c Sun Feb 08 21:14:46 2009 +0000 @@ -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 -r de5ccc7a4461 -r d5119d75439d avformat.h --- a/avformat.h Sun Feb 08 21:09:50 2009 +0000 +++ b/avformat.h Sun Feb 08 21:14:46 2009 +0000 @@ -1116,16 +1116,6 @@ 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 -r de5ccc7a4461 -r d5119d75439d internal.h --- a/internal.h Sun Feb 08 21:09:50 2009 +0000 +++ b/internal.h Sun Feb 08 21:14:46 2009 +0000 @@ -29,4 +29,14 @@ 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 -r de5ccc7a4461 -r d5119d75439d oggenc.c --- a/oggenc.c Sun Feb 08 21:09:50 2009 +0000 +++ b/oggenc.c Sun Feb 08 21:14:46 2009 +0000 @@ -23,6 +23,7 @@ #include "libavcodec/xiph.h" #include "libavcodec/bytestream.h" #include "avformat.h" +#include "internal.h" typedef struct { int64_t duration;