[FFmpeg-cvslog] r16903 - trunk/libavformat/mxfenc.c

[bcoudurier]

Author: bcoudurier
Date: Sat Jan 31 11:51:35 2009
New Revision: 16903

Log:
change prototype of mxf_interleave_get_packet to make it compatible
with av_interleave_packet_per_dts

Modified:
   trunk/libavformat/mxfenc.c

Modified: trunk/libavformat/mxfenc.c
==============================================================================
--- trunk/libavformat/mxfenc.c	Sat Jan 31 11:49:26 2009	(r16902)
+++ trunk/libavformat/mxfenc.c	Sat Jan 31 11:51:35 2009	(r16903)
@@ -1040,7 +1040,7 @@ static int mxf_interleave_new_audio_pack
     return size;
 }
 
-static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, int flush)
+static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
 {
     AVPacketList *pktl;
     int stream_count = 0;
@@ -1111,6 +1111,7 @@ static int mxf_interleave(AVFormatContex
             aic->dts += pkt->duration;
             ff_interleave_add_packet(s, pkt, mxf_compare_timestamps);
         }
+        pkt = NULL;
     }
 
     for (i = 0; i < s->nb_streams; i++) {
@@ -1122,7 +1123,7 @@ static int mxf_interleave(AVFormatContex
         }
     }
 
-    return mxf_interleave_get_packet(s, out, flush);
+    return mxf_interleave_get_packet(s, out, pkt, flush);
 }
 
 AVOutputFormat mxf_muxer = {