From patchwork Mon Mar 12 06:34:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 7944 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1257349jad; Sun, 11 Mar 2018 23:35:18 -0700 (PDT) X-Google-Smtp-Source: AG47ELt6PazWPB9nszOKWwcUZzwWRjiKXRF/R21mICjlfymlWAcmLUzuotn+Koc74QrZYj/VRu2t X-Received: by 10.28.214.2 with SMTP id n2mr4219611wmg.130.1520836518495; Sun, 11 Mar 2018 23:35:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520836518; cv=none; d=google.com; s=arc-20160816; b=Fnqyj5zgKhCnIV1t9uJxPY1NT+lYSoJVSK/pFLDAtqVahqyB5hFA4vbi3Xt3i1dr2T ogmjydvliH58eFuCcFgE+f/IS8ELYVPSZXqv50YOiBz7Ios5e+IwnQxUNQGpee9vj58I ijQ5uw/xcpbinUc35A9OR/NzT/uqkWNq9zHRx7teczw01cNTy5yMmlwgPeQV2y8y4RpO PC6PPfziLJi+nL84ks2jS3d3vIGGF0g/FoIIXmu2+1GQMGQPJSo8olVxMrmgdh1Jzgp+ zqN2Ei/L7o99dCmRMyLdAYYDZ7ZlmBYXKsEH0J2Q8XKmYdxv/NL9XkSRmOLRrJo4lAXV NejQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=LkmfbFEzQgBjzUyezDvwFpUle7TyNpu7d4lJyHjQAck=; b=RwaRdrnNJy9Ua9YdPGUmejMTeNzTDAi1jKHlTSYR4VsJXyxKEw3FjvjfX6k6WB9BAD 9+Z10V3U1XZC8YTpAV9wV+ARLKVIo/DOP0P32qCRP9fGYhrFwhW6a+l1USAyl4+yH6bi kNag9k9OOiOfWD9CuvjxfXeTDiZzck8lj2USv4cjxpVRYGkpWSm9Oq6ZdCjI8t+PMRIx PEM9HJZrMcBbxh6aaYTPi7P75kcZaCFzXlwTy5G0Ex2PNSS2Ayn8m/cQ2eoXprDSuCAN SJ10GND4OOkMigXJwZtQTBYOvMDJnd3j4eRsReNrS1j+nZtz6QieN/KUIU2fcishiWzF 1fPA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x199si3000182wmd.31.2018.03.11.23.35.18; Sun, 11 Mar 2018 23:35:18 -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 6B41E68A3E0; Mon, 12 Mar 2018 08:35:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg65.qq.com (smtpbg65.qq.com [103.7.28.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D3FA68A109 for ; Mon, 12 Mar 2018 08:34:53 +0200 (EET) X-QQ-mid: bizesmtp16t1520836469twkibhsy Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 12 Mar 2018 14:34:28 +0800 (CST) X-QQ-SSF: 01600000004000F0FKF0B00A0000000 X-QQ-FEAT: NCurqkplqhNIeIHzGbI+lA039Sdh34JVRSjrFme1ukIpKY58uAMCuEH7b6Qdi fzibjh+hMFXqdIQ2yKRChiLPAwOj552NI9ZvdfPZ7U7t06exlM8KZzzq6+vsANaCOdJ+KUR NWY046/Rhh5L75d7wsULjc5oBAyEs4xil6Hdy7gMNRlvdDrt7pZR4c+zI2RIueUkm62UqkP KNfkyqbTG66OqsVyHT13XF/I9haaQwKNQQQdRvMR7ucFpGJjv1itXFG+F+ggkCGtSt07P2d PxD2GWVxE0jw1uhK2c8mldTRYnCCNxc+TppA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 14:34:27 +0800 Message-Id: <20180312063427.13946-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/hlsenc: fix write wrong init file URI string problem 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" fmp4_init_filename should append after base_output_dirname Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 08fe0aa7a0..9c5798b557 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2581,21 +2581,6 @@ static int hls_init(AVFormatContext *s) } av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, fmp4_init_filename_len); - - if (av_strcasecmp(hls->fmp4_init_filename, "init.mp4")) { - ret = format_name(vs->fmp4_init_filename, fmp4_init_filename_len, i); - if (ret < 0) - goto fail; - - fmp4_init_filename_len = strlen(vs->fmp4_init_filename) + 1; - vs->base_output_dirname = av_malloc(fmp4_init_filename_len); - if (!vs->base_output_dirname) { - ret = AVERROR(ENOMEM); - goto fail; - } - av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename, - fmp4_init_filename_len); - } else { if (hls->nb_varstreams > 1) { ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); if (ret < 0) @@ -2622,7 +2607,6 @@ static int hls_init(AVFormatContext *s) av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename, fmp4_init_filename_len); } - } } if (!hls->use_localtime) {