From patchwork Fri Feb 28 09:53:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17952 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 989EB44AE64 for ; Fri, 28 Feb 2020 11:53:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BEDD68B294; Fri, 28 Feb 2020 11:53:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D52768B1D0 for ; Fri, 28 Feb 2020 11:53:32 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id y17so2222469wrn.6 for ; Fri, 28 Feb 2020 01:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=joBqUW/F4wvK9kgftetxQQGIJ7bQROeSEgV2fC3XH7Y=; b=jhChxhN1kDxBEJEYGyeNKgK+4cVqNzx9Lcd8PwhZSjbd8Gkfj7aXI8QcY/MebOwhhU QvvzHJjqF3DkyS03VlsSaGhRiJ0VehPiZpQLsQLT3HcJjB55TWW2Ga1GL3O+tXvUj9UE Vm9O3e4VN8AL7o3Ps0RRmkIw81CHsmTmQ/6kvsZhf1xqIIFd+j8noENY20tTrN4lUeWL AbpL3sCUwiNb6U2Aca4MnDIBqOa3IyTurtV1Ix8227OA41hDz9gAcxjBoAl+bEf44Jy6 cxg61ydCdxxJLUsSIKnfnJ+D3iBm7xIoYErcOY1KwNzSHHBB2hglxf9exLml+GURMjJ/ /d6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=joBqUW/F4wvK9kgftetxQQGIJ7bQROeSEgV2fC3XH7Y=; b=laja2012QzjTA8Ncv1rhQWoqiYeQIVtniUU/jq0Gfzo1xbYMMdkivIlYL1Eq2r9Fv1 fych+0aRF8Qp9DFiKN+S3F3Ky0ARZZkqS745BR6Nbkrmyj4c0e1mqztt3YuY4ReOGS7f /T7x83u8UA8sGWU0vpdSAaFYYGzsRMOXPY/nn8qlOKOdbUMxuWplNoOS43tjAR9qXLvg e04tmZtRvRGA6cLcpM08CbqiBiB1i1cQcxSc/9uaFFVUCwiiz/y1pkk/xfBuQ8cwibgo KLZ2LUuzXU36rszs5Ye8iqJ9ODpshoQf7qE2gu4kQhRp6dp1I2rTaCjm+wOTHI09O+yK UvKg== X-Gm-Message-State: APjAAAXfPClf9GeMHYAsysOp5dwwZq0TbTGO1rsE9K3NegRDkBUsANop +rxm/qVGy0OwTXbPGLnhYf6dKbKf X-Google-Smtp-Source: APXvYqy1KyYDaRmWvdMwzoPc9afuwNL8shwqb3LSCu/OZfybs8+RWv/F3raPPY2eaW0xNi94+4SdLg== X-Received: by 2002:adf:f1cb:: with SMTP id z11mr3941185wro.375.1582883611365; Fri, 28 Feb 2020 01:53:31 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id c8sm1453360wru.7.2020.02.28.01.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 01:53:30 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2020 10:53:15 +0100 Message-Id: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/7] avformat/hlsenc: Avoid setting unused variables 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Several variables which are only used when the HLS_SINGLE_FILE flag is unset have been set even when this flag is set. This has been changed. Signed-off-by: Andreas Rheinhardt --- Now not moving variables into a smaller scope. libavformat/hlsenc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f6dd894343..51cbfba151 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2332,11 +2332,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } } - if (oc->url[0]) { - proto = avio_find_protocol_name(oc->url); - use_temp_file = proto && !strcmp(proto, "file") && (hls->flags & HLS_TEMP_FILE); - } - if (hls->flags & HLS_SINGLE_FILE) { ret = flush_dynbuf(vs, &range_length); av_freep(&vs->temp_buffer); @@ -2345,6 +2340,12 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } vs->size = range_length; } else { + if (oc->url[0]) { + proto = avio_find_protocol_name(oc->url); + use_temp_file = proto && !strcmp(proto, "file") + && (hls->flags & HLS_TEMP_FILE); + } + if ((hls->max_seg_size > 0 && (vs->size >= hls->max_seg_size)) || !byterange_mode) { AVDictionary *options = NULL; char *filename = NULL; @@ -2394,10 +2395,9 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) av_freep(&vs->temp_buffer); av_freep(&filename); } - } - if (use_temp_file && !(hls->flags & HLS_SINGLE_FILE)) { - hls_rename_temp_file(s, oc); + if (use_temp_file) + hls_rename_temp_file(s, oc); } old_filename = av_strdup(oc->url);