ffmpeg | branch: release/1.2 | Stefano Sabatini <stefa...@gmail.com> | Tue Jan 21 19:58:41 2014 +0100| [fa8d407c1f8fc10a614cdb3bd68a6e4e91ec2ab7] | committer: Michael Niedermayer
lavf/segment: remove duplicated and inconsistent cleanup code in seg_write_packet() In particular, avoid to leave around the seg->avf pointer to freed structure, and fix crash with: ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -f segment foo-%d.ts (cherry picked from commit 169065fbfb3da1ab776379c333aebc54bb1f1bc4) Found-by: Qinghao Tang Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa8d407c1f8fc10a614cdb3bd68a6e4e91ec2ab7 --- libavformat/segment.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 124a09f..f0b201b 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -717,12 +717,6 @@ fail: if (pkt->stream_index == seg->reference_stream_index) seg->frame_count++; - if (ret < 0) { - if (seg->list) - avio_close(seg->list_pb); - avformat_free_context(oc); - } - return ret; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
