[SCM] libav/experimental: document ff_audio_interleave

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:37:14 UTC 2013


The following commit has been merged in the experimental branch:
commit 94027d3bdd1a4cb7fef47035a67a894ca70e4ab8
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun Feb 8 21:08:34 2009 +0000

    document ff_audio_interleave
    
    Originally committed as revision 17066 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h
index a50e7a6..d5b2957 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 *));

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list