Mercurial > libavformat.hg
changeset 4426:7854590fb1fd libavformat
rename ff_audio_interleave to ff_audio_rechunk_interleave
| author | bcoudurier |
|---|---|
| date | Mon, 09 Feb 2009 21:34:20 +0000 |
| parents | 58451dddc381 |
| children | 4d45ef755d67 |
| files | audiointerleave.c audiointerleave.h gxfenc.c mxfenc.c |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/audiointerleave.c Mon Feb 09 19:57:23 2009 +0000 +++ b/audiointerleave.c Mon Feb 09 21:34:20 2009 +0000 @@ -93,7 +93,7 @@ return size; } -int ff_audio_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush, +int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush, int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int), int (*compare_ts)(AVFormatContext *, AVPacket *, AVPacket *)) {
--- a/audiointerleave.h Mon Feb 09 19:57:23 2009 +0000 +++ b/audiointerleave.h Mon Feb 09 21:34:20 2009 +0000 @@ -49,7 +49,7 @@ * @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 ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush, int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int), int (*compare_ts)(AVFormatContext *, AVPacket *, AVPacket *));
--- a/gxfenc.c Mon Feb 09 19:57:23 2009 +0000 +++ b/gxfenc.c Mon Feb 09 21:34:20 2009 +0000 @@ -789,7 +789,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) { - return ff_audio_interleave(s, out, pkt, flush, + return ff_audio_rechunk_interleave(s, out, pkt, flush, av_interleave_packet_per_dts, ff_interleave_compare_dts); }
--- a/mxfenc.c Mon Feb 09 19:57:23 2009 +0000 +++ b/mxfenc.c Mon Feb 09 21:34:20 2009 +0000 @@ -1442,7 +1442,7 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) { - return ff_audio_interleave(s, out, pkt, flush, + return ff_audio_rechunk_interleave(s, out, pkt, flush, mxf_interleave_get_packet, mxf_compare_timestamps); }