summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-31 10:51:35 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-31 10:51:35 +0000
commit8f819636b7dfbae7b118c2100934c5308d7c73d8 (patch)
treede92410498d5424b1b88acb59d6259e005179022
parent59bcc93bb188416aee294185242683c10bce5157 (diff)
change prototype of mxf_interleave_get_packet to make it compatible
with av_interleave_packet_per_dts Originally committed as revision 16903 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mxfenc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 02a0e54f9e..ba23a00e06 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1040,7 +1040,7 @@ static int mxf_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
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(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int
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(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int
}
}
- return mxf_interleave_get_packet(s, out, flush);
+ return mxf_interleave_get_packet(s, out, pkt, flush);
}
AVOutputFormat mxf_muxer = {