From patchwork Mon Mar 13 07:50:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2914 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1057538vsy; Mon, 13 Mar 2017 00:50:37 -0700 (PDT) X-Received: by 10.28.215.18 with SMTP id o18mr9337860wmg.98.1489391437634; Mon, 13 Mar 2017 00:50:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f12si23499315wrf.325.2017.03.13.00.50.36; Mon, 13 Mar 2017 00:50:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4BAF68826E; Mon, 13 Mar 2017 09:50:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 180F9680A61 for ; Mon, 13 Mar 2017 09:50:07 +0200 (EET) X-QQ-mid: bizesmtp8t1489391416td7gmghj8 Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 13 Mar 2017 15:50:16 +0800 (CST) X-QQ-SSF: 01100000002000F0F930000A0000000 X-QQ-FEAT: QX/rXDl9P1shEsMtuU5KFaTLdluwqMZ+B1XSZeIwgxdgXN3MCzuaOaR0sMCrq I+TVKujN3ltyeXzwGlRrcaAkyYTUTb9LL38CVcp/rNLceHZYWKYwCD/8ALBSwCelYcib79j qITxGjI0rIgkfJ7QLDdFDHMelw15bE/o02j21BdZsmZs1H8wzTDwBpky2GLucFVPmXOfA+X 1bQxLKsQSfs2NBU38MfBu4t2CPqIc/B80+/NXWTBUVlOF1LqoADvvgB1YaQERhY9h1mr+OY VVIA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2017 15:50:15 +0800 Message-Id: <20170313075015.17926-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix ticket 6231 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" check if the hls_flags is byterange_mode and check if should close fd Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index b8122f1..5bcface 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1319,6 +1319,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) end_pts, AV_TIME_BASE_Q) >= 0) { int64_t new_start_pos; char *old_filename = av_strdup(hls->avf->filename); + int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); if (!old_filename) { return AVERROR(ENOMEM); @@ -1329,9 +1330,11 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) new_start_pos = avio_tell(hls->avf->pb); hls->size = new_start_pos - hls->start_pos; - ff_format_io_close(s, &oc->pb); - if (hls->vtt_avf) { - ff_format_io_close(s, &hls->vtt_avf->pb); + if (!byterange_mode) { + ff_format_io_close(s, &oc->pb); + if (hls->vtt_avf) { + ff_format_io_close(s, &hls->vtt_avf->pb); + } } if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { if (!(hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size <= 0))