From 43b601d36ffcdc944d9b5f16ca340f03667c9f14 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 21 Jan 2014 19:58:41 +0100 Subject: [PATCH] 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 --- libavformat/segment.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index dbcfe898cf..29dd935fbc 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -718,12 +718,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; }