diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2014-01-21 19:58:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-30 15:38:21 +0100 |
| commit | 67e2394cc68eea02c3789c8a097c5e2906bac5d2 (patch) | |
| tree | 81eeaab4f870a3f47af39958c1c0ab7cb41e1b83 | |
| parent | a736171b69b0a05acbb463fdbbc6114305c7c99b (diff) | |
| download | ffmpeg-67e2394cc68eea02c3789c8a097c5e2906bac5d2.tar.gz | |
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 <michaelni@gmx.at>
| -rw-r--r-- | libavformat/segment.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index dca7822f24..ce4af8bb9e 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -710,12 +710,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; } |