From 16e3b0b3e6f89d40db9207b31845bec5a3a46e78 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Mon, 9 Feb 2009 21:34:20 +0000 Subject: [PATCH] rename ff_audio_interleave to ff_audio_rechunk_interleave Originally committed as revision 17103 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/audiointerleave.c | 2 +- libavformat/audiointerleave.h | 2 +- libavformat/gxfenc.c | 2 +- libavformat/mxfenc.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index 31e59cfe1f..9434ed2688 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -93,7 +93,7 @@ static int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt, 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 *)) { diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h index 45ba9e27fd..10684af50c 100644 --- a/libavformat/audiointerleave.h +++ b/libavformat/audiointerleave.h @@ -49,7 +49,7 @@ int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt) * @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 *)); diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index f0c0361966..5bf63f2248 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -789,7 +789,7 @@ static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt) 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); } diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index b004226cfc..a3a9b397d0 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1442,7 +1442,7 @@ static int mxf_compare_timestamps(AVFormatContext *s, AVPacket *next, AVPacket * 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); }