Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

change prototype of mxf_interleave_get_packet to make it compatible

Browse source 
with av_interleave_packet_per_dts

Originally committed as revision 16903 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-01-31 10:51:35 +00:00
parent 59bcc93bb1
commit 8f819636b7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libavformat/mxfenc.c
View file

@ -1040,7 +1040,7 @@ static int mxf_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
return size; 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; AVPacketList *pktl;
int stream_count = 0; int stream_count = 0;
@ -1111,6 +1111,7 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int
aic->dts += pkt->duration; aic->dts += pkt->duration;
ff_interleave_add_packet(s, pkt, mxf_compare_timestamps); ff_interleave_add_packet(s, pkt, mxf_compare_timestamps);
} }
pkt = NULL;
} }
for (i = 0; i < s->nb_streams; i++) { 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 = { AVOutputFormat mxf_muxer = {