rename ff_audio_interleave to ff_audio_rechunk_interleave

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17103 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c
index 31e59cfe1f3bff3c191041dce8cc2b3be8dd4248..9434ed26889289c7a31765d668f0137fcd7f6c72 100644 (file)
--- 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 45ba9e27fdb6e8135888b7ac34b9f927557ca77e..10684af50c2a01fdc6c4b2fc267ee90853f28dbd 100644 (file)
--- 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 f0c036196622f19fdb1b09c4b4937356a15410d8..5bf63f22481c1f1da446882ed33b894de3156585 100644 (file)
--- 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 b004226cfc823e8517ccb633b36faae4845451c0..a3a9b397d0eb7756c09978c5aea50b3340194536 100644 (file)
--- 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);
 }