Mercurial > libavformat.hg

changeset 4328:fb0fde31327a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change prototype of mxf_interleave_get_packet to make it compatible with av_interleave_packet_per_dts
author bcoudurier
date Sat, 31 Jan 2009 10:51:35 +0000
parents 60bad0ded22a
children bd49910ad4a0
files mxfenc.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mxfenc.c	Sat Jan 31 10:49:26 2009 +0000
+++ b/mxfenc.c	Sat Jan 31 10:51:35 2009 +0000
@@ -1040,7 +1040,7 @@
     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 @@
             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 @@
         }
     }
 
-    return mxf_interleave_get_packet(s, out, flush);
+    return mxf_interleave_get_packet(s, out, pkt, flush);
 }
 
 AVOutputFormat mxf_muxer = {