aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-02-08 21:08:34 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-02-08 21:08:34 +0000
commit94027d3bdd1a4cb7fef47035a67a894ca70e4ab8 (patch)
tree7a2fbcb22649928623e49ac98914ad3171ba7399
parent0d20c3fdad10324b262eda3a22bc9947d1d5911b (diff)
downloadffmpeg-94027d3bdd1a4cb7fef47035a67a894ca70e4ab8.tar.gz
document ff_audio_interleave
Originally committed as revision 17066 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/audiointerleave.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h
index a50e7a61bf..d5b2957c00 100644
--- a/libavformat/audiointerleave.h
+++ b/libavformat/audiointerleave.h
@@ -42,6 +42,15 @@ void ff_audio_interleave_close(AVFormatContext *s);
int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt);
int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
int stream_index, int flush);
+/**
+ * Rechunk audio pcm packets per AudioInterleaveContext->samples_per_frame
+ * and interleave them correctly.
+ * AVStream->priv_data first element must be AudioInterleaveContext
+ * when using this function.
+ *
+ * @param get_packet function will output a packet when streams are correctly interleaved.
+ * @param compare_ts function will compare AVPackets and decide interleaving order.
+ */
int ff_audio_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush,
int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int),
int (*compare_ts)(AVFormatContext *, AVPacket *, AVPacket *));