Simplify packet duplication code in ff_interleave_add_packet.
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sat, 11 Apr 2009 22:38:00 +0000 (22:38 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sat, 11 Apr 2009 22:38:00 +0000 (22:38 +0000)
Behaviour only changes if pkt->destuct neither av_destruct_packet,
av_destruct_packet_nofree nor NULL, in which case the new code avoids a double free.

Originally committed as revision 18452 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/utils.c

index 535da98..0dec40f 100644 (file)
@@ -2613,10 +2613,8 @@ void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
 
     this_pktl = av_mallocz(sizeof(AVPacketList));
     this_pktl->pkt= *pkt;
-    if(pkt->destruct == av_destruct_packet)
-        pkt->destruct= NULL; // not shared -> must keep original from being freed
-    else
-        av_dup_packet(&this_pktl->pkt);  //shared -> must dup
+    pkt->destruct= NULL;             // do not free original but only the copy
+    av_dup_packet(&this_pktl->pkt);  // duplicate the packet if it uses non-alloced memory
 
     next_point = &s->packet_buffer;
     while(*next_point){