From patchwork Mon Aug 20 11:13:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10033 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2384436jap; Mon, 20 Aug 2018 04:22:01 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwpb5nauJ6komoWelzz2Jdo2/K9t8AOQ/hr6tThTDBuYSThqQWNNclma7+KNYQqZ6YS338Q X-Received: by 2002:a1c:e043:: with SMTP id x64-v6mr25749028wmg.58.1534764121234; Mon, 20 Aug 2018 04:22:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534764121; cv=none; d=google.com; s=arc-20160816; b=DWkTWqWl5/U0AawwwE5awXEjKYNsTEgfY+7mFqnskmPCZpEtN5JpXtcZ8PZyUHVFUs EaMapsO1OIBEUuAXC2/wSaXvU62bjXexiXlgmZIdrCXAPWyD5IB+t2HG6DjBF6Deumez EIJ6n0zRG8I1hZ7UIZOZ+HSJrFyKyc7b0MYWK0jX9iBC4TJrjfWiwa4zvAmjIfCuuh16 n5FjtgBoEUB7GPEJqkhZIX8Ew2P5p87hd8lsEKghS9ZcJBzrUogakZZEicyEUE0fwZNz Dl1afjjdZ5i4dx4T1Ru4/d43psbDmKBebeLmVHyDuEbxDRq94FJsgn2qrUGbqid4opX6 IIgg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=nI8eLxWSiI9qJg7mJfWOB6GzQbcZHaaJ2IvQj8JC9YM=; b=DX11OWT5FcGb4leg4O7KvaKqUTWNBCAf4MZmeX9sNzAjQbxDnDlWaIOyMLYnRSKgr+ DHxteZRi3kXZjVgzx5H3LusmrQJ0m9aE+gj73SKCgeT78DQmGJxJ2W+RuqqEoA5BUx6I 7k7MrLBGr+JUcoI3Pz4J2veYfnqO5mtt07BekHKSHbAIPrtw4XprnHO1kCM3AZxiNk5U K6KPeuS7GRiJRWAvdeSP5OrzaSAzn1r63lXi0tWcKnDKsBSrxxjWIfK5KtJ3uBdks3Z7 oGR5FfdVGNzGpD3i3owGwbFiF0B/+8lokhMetvCW1dJrC/uOr5nQebmw1IaXk0ajVo0B gXTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hynQbBlz; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o8-v6si7718404wro.267.2018.08.20.04.22.00; Mon, 20 Aug 2018 04:22:01 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hynQbBlz; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F3D4689ABA; Mon, 20 Aug 2018 14:21:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0D47689ABA for ; Mon, 20 Aug 2018 14:21:25 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id y4-v6so6626435pgp.9 for ; Mon, 20 Aug 2018 04:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bA2QQz5AvpVBRoP/BW3SGfztFDDXoX1tqvNywyo+0lc=; b=hynQbBlzB57xkGvHQP+VVWvKGfeoYZ4GXnAMYayis7T8pddeG1GY1cSIxrGbeoCsLR ZQzUXq77wyhrvkVf80QIaLyQecONgZ5e3yoa16QAuBPqLlLF+2bIBYpDZoUfC+QZc25V 3jTQlXXqjD2Bd59/vlIatfYyBKlSbwwBXZwgFr9Hx6wfl1FpWLr0uhJDEjRKj6/iLeMD uWidNO5oLqoMhfKC0I5SoGJqOJWEEeaLNnrhurF5tcIjF+ZG3ZSSXUMzBtqbXNxQu3wg sFHnEULsUEcDApvV29JqS/cpi4MYvJpvEjjb648H/zSdX80MIv/3h+9eRjMWyJSaU/4Q yFVw== 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; bh=bA2QQz5AvpVBRoP/BW3SGfztFDDXoX1tqvNywyo+0lc=; b=NmE7s7IO4WP+cG01EgaDl2FEr5yhAj4rRvZ9SxR4ELcGKpR4nXhZPMxCSrOYyHb22r oTZ3tT6lgvYoTj9LnR2/HxmBmNkKH5MdCCKTvdJGGPSx6sx0+8H9BUaR5chl+phGxDKs 8dJqMXcRueTaHNl/WdCXQC0fPHt8CKroB0tM9oetGoXN9VTiY7yRIcbxXgTwLsZQvxY9 d7WT43wBGGuSBWzsDRocLi6CgoAwgaXndOQtvQWYVLBF0FPyclmVyuzw9GZqUuKwNjG9 tGjEVpfnd0HAmCDlvqeVkh7T46KSgeLr3ruvRzv+03u/TbTtSBeSIoykv/FGw6Qzq96n i8xg== X-Gm-Message-State: AOUpUlHjQntMkpf2cO4diEFR5KlibKvmohbxvbmc5bDufBsN8QAnP0bm kfHPeZiZTOShEDBwqQliKHLnNto0 X-Received: by 2002:a63:b19:: with SMTP id 25-v6mr11693765pgl.301.1534763628074; Mon, 20 Aug 2018 04:13:48 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id u2-v6sm12627362pfn.59.2018.08.20.04.13.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 04:13:46 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Aug 2018 19:13:40 +0800 Message-Id: <1534763621-12036-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH 1/2] lavf/hlsenc: fix mixed declarations and code warning. 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix the build warning for "ISO C90 forbids mixed declarations and code" Signed-off-by: Jun Zhao --- libavformat/hlsenc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 43e6fc8..c261016 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2152,6 +2152,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) uint8_t *buffer = NULL; VariantStream *vs = NULL; AVDictionary *options = NULL; + char *old_filename = NULL; for (i = 0; i < hls->nb_varstreams; i++) { vs = &hls->var_streams[i]; @@ -2218,7 +2219,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } - char *old_filename = NULL; if (vs->packets_written && can_split && av_compare_ts(pkt->pts - vs->start_pts, st->time_base, end_pts, AV_TIME_BASE_Q) >= 0) { int64_t new_start_pos;