[FFmpeg-cvslog] r17103 - in trunk/libavformat: audiointerleave.c audiointerleave.h gxfenc.c mxfenc.c

[bcoudurier]

Author: bcoudurier
Date: Mon Feb  9 22:34:20 2009
New Revision: 17103

Log:
rename ff_audio_interleave to ff_audio_rechunk_interleave

Modified:
   trunk/libavformat/audiointerleave.c
   trunk/libavformat/audiointerleave.h
   trunk/libavformat/gxfenc.c
   trunk/libavformat/mxfenc.c

Modified: trunk/libavformat/audiointerleave.c
==============================================================================
--- trunk/libavformat/audiointerleave.c	Mon Feb  9 20:57:23 2009	(r17102)
+++ trunk/libavformat/audiointerleave.c	Mon Feb  9 22:34:20 2009	(r17103)
@@ -93,7 +93,7 @@ static int ff_interleave_new_audio_packe
     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 *))
 {

Modified: trunk/libavformat/audiointerleave.h
==============================================================================
--- trunk/libavformat/audiointerleave.h	Mon Feb  9 20:57:23 2009	(r17102)
+++ trunk/libavformat/audiointerleave.h	Mon Feb  9 22:34:20 2009	(r17103)
@@ -49,7 +49,7 @@ int ff_interleave_compare_dts(AVFormatCo
  * @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 *));
 

Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c	Mon Feb  9 20:57:23 2009	(r17102)
+++ trunk/libavformat/gxfenc.c	Mon Feb  9 22:34:20 2009	(r17103)
@@ -789,7 +789,7 @@ static int gxf_write_packet(AVFormatCont
 
 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);
 }
 

Modified: trunk/libavformat/mxfenc.c
==============================================================================
--- trunk/libavformat/mxfenc.c	Mon Feb  9 20:57:23 2009	(r17102)
+++ trunk/libavformat/mxfenc.c	Mon Feb  9 22:34:20 2009	(r17103)
@@ -1442,7 +1442,7 @@ static int mxf_compare_timestamps(AVForm
 
 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);
 }