From patchwork Wed Nov 22 08:08:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jeyapal, Karthick" X-Patchwork-Id: 6257 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6329251jah; Wed, 22 Nov 2017 00:09:27 -0800 (PST) X-Google-Smtp-Source: AGs4zMaqjwIiHRmf1t71ZvDTL3jSEPEhmt91h8tLu9VvSP4Lomo9fqVNoBmBYyXRbbff7TRSijwj X-Received: by 10.223.156.201 with SMTP id h9mr10864769wre.143.1511338167697; Wed, 22 Nov 2017 00:09:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511338167; cv=none; d=google.com; s=arc-20160816; b=dNe5GK33eNdDd/hjOnmX8HmB25KsT4m6lJPyxQN726mG6lDnVaTo12mpYVe8zvk4qr 4h6zGggabORwynrQTKJGOteyPTsc0muQJ6xlO/yAe3IJk9EAyuM5P4hEQRe+iy8uezHO aH53VAPIhh4kfMbnYKKOGz+pv5RK3pFx1YixuTkNUhl7QvPXPTGmvOsVbmCpkp98h7hS 4lKl9zF5RVSE/ZHUUkAz+krpkI62IHIQkWQE1UtCg9EN2QhzZkha2IyKcC4UrbUh4YcL GnKxpcKx/kU/jpDK5CNXS1qRoUNzelNSoZV5b1efEbhZGpiUmEmIbsE+d65w+KNnFu4w eojg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=RYhaInNAyx1Qf7ReikF5iRbCcWdrv0W0WO29oNw1ln8=; b=XgDcZbmfEw/y2i0qw3u9Gd4Hif7iY75vC9By7Gyxeul9JJymZTR8ZYKS/53196QNZb wZWMK5quuB7CMDuxQGO3tAQYSiIGqNxbvTX4fkzV04NQl7lu4BQfXY1qrE86bQyRhMiO rUQZc/YLbQSuXm7UzkO62o52uiTMUgAOKgis/u8T6rle4qz6aCwgLlnbw6BweD0TjSp9 sU87oYQiYCP5FyZpRKhyoVkpkQsanrfl89MON6qJVxVY3fU85d9pjEWkwBqXNh7oAI+y Gp0bhCjzHcGpNSbFJxTV9YRNUp4QZFTqckQHO+k6tFjCjmRO13YepZsiacti/aIG/mpc JjwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=MmvbcKrK; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h129si2575517wmf.76.2017.11.22.00.09.27; Wed, 22 Nov 2017 00:09:27 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=MmvbcKrK; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97B6668A0DF; Wed, 22 Nov 2017 10:09:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 216B4689FF2 for ; Wed, 22 Nov 2017 10:09:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1511339063; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=Yev9BfVElacWR4Fk2sSdhY1jzE7aLES/hHrjzMixskg=; b=MmvbcKrK ZJK+Rev7chVq1G1Vz3pIOJoo4B7zQ1ZOk8wQp9Yrm3Fri2uZBZMgUXfCrTxPolXu9Eym7NN33qYRj RCBG54TAIbnU2o81tV0yoRVi2Duhti0/7veqyKGbAakr4RAvrYejTbotZyBWpv0tcceEsufx+z6/W UURsGIDOyDUnEUFEXrJNJuze4YLRVRqqFVOHN729C/3fqSI+gOnQq5zdNuRODfydAoT6NCzzAS/uY jKRCxNX9HBCanRXzYDaWU3/9qwm/91FPADYnaJgrmS4MlwKlVczNaCY5PnTQF0bYmJKZaL5bEwQZv e8NJoJ9z8i5fwbao541UB4LK3g==; From: Karthick J To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Nov 2017 13:38:55 +0530 Message-Id: <1511338135-12551-2-git-send-email-kjeyapal@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511338135-12551-1-git-send-email-kjeyapal@akamai.com> References: <1511338135-12551-1-git-send-email-kjeyapal@akamai.com> X-Smtpcorp-Track: 1-HQ5qRyIOGwEL.FbCrH4I0n Feedback-ID: 337386m:337386asVRLGB:337386s3nNLuNfG3:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: Refactor an inconsistent variable name 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: Karthick J MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/hlsenc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 525605b..611cc99 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1074,7 +1074,7 @@ static int create_master_playlist(AVFormatContext *s, AVDictionary *options = NULL; unsigned int i, j; int m3u8_name_size, ret, bandwidth; - char *m3U8_rel_name; + char *m3u8_rel_name; input_vs->m3u8_created = 1; if (!hls->master_m3u8_created) { @@ -1108,14 +1108,14 @@ static int create_master_playlist(AVFormatContext *s, vs = &(hls->var_streams[i]); m3u8_name_size = strlen(vs->m3u8_name) + 1; - m3U8_rel_name = av_malloc(m3u8_name_size); - if (!m3U8_rel_name) { + m3u8_rel_name = av_malloc(m3u8_name_size); + if (!m3u8_rel_name) { ret = AVERROR(ENOMEM); goto fail; } - av_strlcpy(m3U8_rel_name, vs->m3u8_name, m3u8_name_size); + av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size); ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name, - m3U8_rel_name, m3u8_name_size); + m3u8_rel_name, m3u8_name_size); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Unable to find relative URL\n"); goto fail; @@ -1145,7 +1145,7 @@ static int create_master_playlist(AVFormatContext *s, if (!bandwidth) { av_log(NULL, AV_LOG_WARNING, "Bandwidth info not available, set audio and video bitrates\n"); - av_freep(&m3U8_rel_name); + av_freep(&m3u8_rel_name); continue; } @@ -1153,14 +1153,14 @@ static int create_master_playlist(AVFormatContext *s, if (vid_st && vid_st->codecpar->width > 0 && vid_st->codecpar->height > 0) avio_printf(master_pb, ",RESOLUTION=%dx%d", vid_st->codecpar->width, vid_st->codecpar->height); - avio_printf(master_pb, "\n%s\n\n", m3U8_rel_name); + avio_printf(master_pb, "\n%s\n\n", m3u8_rel_name); - av_freep(&m3U8_rel_name); + av_freep(&m3u8_rel_name); } fail: if(ret >=0) hls->master_m3u8_created = 1; - av_freep(&m3U8_rel_name); + av_freep(&m3u8_rel_name); ff_format_io_close(s, &master_pb); return ret; }