From patchwork Wed Jun 26 10:57:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 50151 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ccd2:0:b0:482:c625:d099 with SMTP id q18csp346795vqv; Wed, 26 Jun 2024 03:57:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVl95xA+COHGFLl+EQR7h6r+70oX/bu+4a0cJJ71ssCCtVs9yfGAIoAfNobXW+zcqX5NRDFojEvrreOaTRDpr2IK2FyeFVb03iegg== X-Google-Smtp-Source: AGHT+IGxvGcxSOD/h954DkRRkXcwiVEJsw7YxKftbl+6Tp36mFH4nFG/V1gH/96qEbOzbKC2GPsE X-Received: by 2002:a17:906:b20b:b0:a72:8d40:52b8 with SMTP id a640c23a62f3a-a728d405f59mr79319566b.3.1719399470541; Wed, 26 Jun 2024 03:57:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719399470; cv=none; d=google.com; s=arc-20160816; b=QGX2to9qdD2tjIOxLe9kSZKZyjsV/KI7XHf8gbIwUDN8DV+ctpUZqoAWxEsf6qAW/R rZwGeAoX25H7FqxITlsYTA8qI49LNH11C4aew+aVMbG8PnaICKyPb+NKXpKpjOpKdded MsET1xMEGPxfMUlfNCxFgQGgdWftFo/wXxIHxHXeyNqeVOuvMx6SLi5wvjv31XKYcc34 7E5V317SBj4SB47je6QEC/ctCCHXm3Uag7A3ZllhELTovffRiXApG4Hw1CIRvMSQojZr f8TqGjKSMG9sTffcgzlrjPWRrR+6EDgPQMGJRiQB+MILtmx+WmXEoAOxkabjIK0HI9+R sCDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=SjKt+6AJIKmIqyfNVcCqz7FSm7Wn2/HYCxqVgVy/eao=; fh=w8JR1T/5WquwCqgnlKgniZcITMXOtCHDzF0NyyyGKZI=; b=JT7CBToAETxj0MoDM/QX1yJIkcD8IkFIhDx5fz0zn/kf3/+wW6HUUx6K7Gh90NQs2K 6Wixk2WZx9TAU0XUdoeRMxhihNXkTeIPuMKZM/df0HgEV7DfxXzS23DPC5z0IBLa8u9O d//+hZgoNT7sDiK1EYj+UwGP8SB/GF4Gi5EVIflooV+1qn6LbUNFo08nXvDJNgOtkm4v B/PIaKrwdTdk6TJy/B748oC65q/snJxGt/Jw5igQ/fVdwrD06Pw5K8JUxGRdJI53tKMP C6N18m6ezeoyjdpMkLkQVolp2jvL3jMH/+mpkcraIj0YyrnU32o21ygT67GWiZFdHTbQ Gw0g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=awKV7y2c; 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 a640c23a62f3a-a711ec4caaesi448095966b.930.2024.06.26.03.57.49; Wed, 26 Jun 2024 03:57:50 -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=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=awKV7y2c; 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 DD2FF68D57C; Wed, 26 Jun 2024 13:57:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C89568D26B for ; Wed, 26 Jun 2024 13:57:40 +0300 (EEST) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-52cdf579dd2so4064379e87.3 for ; Wed, 26 Jun 2024 03:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1719399459; x=1720004259; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=w/JmEiku+UenKdtOzTbEM9LeDwd2twhQbA4B89VTa/Q=; b=awKV7y2cctBIbBDXTPhLVCTpJsMCgB335Btr5pcW8pdxVIuY9cTlpdkq1mYT2iX61m uJ6xc/dL0V8T6DKmkIkbPd7RMBQeZd+JkfSW2+mto6aM4IabJnSvz9tJBewl/W29IP8c r6bTSBZ5oQDU7apXapva4AHRVwqfEs+4egP6LLXIBMXRDiWB8OnVoRtAKGzn3u9H6ksT xqaypAxhFATdeVGeswfHGJT70D7VOB0x8LB1CBdmA1QMWokyAc3BrTjXhYzteJki5tg6 mhcIhHye4U2Ld7/RLM7TTH104qqVlAxuGLWU95nPjAtdK2GRz1laLOwyf4t/ydlPzjQM ykfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719399459; x=1720004259; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=w/JmEiku+UenKdtOzTbEM9LeDwd2twhQbA4B89VTa/Q=; b=H0Naw4S99QGR10rXXS7OvXXLjEtbOy0YiFCtmymBhgWB+AXPnMjJPXD47GrpthLEbR TgJIa2EDnWnc1o7MQhqB1q4AUbi6KjTgyfJAjxu0dIrfXuYQWCQ7zaWGSBh+UMZlSnzM GdMOMZoBrF5/XeerAnc8PrC8d5mYFw4mywKqpDkiSkLXQxeL6dcfuV5tHD1E3LrK6eib T6wFlxpbRfU0jPDlxW43nnndNpLDZg9dGOKvZw2pICx+m06WALjdGED4uLpTXNrtWajH E7yYQfjwmK5Ou6JAv1Kej67H+ByI1qriV/IXLx0pK/RPjTSwGMYagtQiwbgpLiwYW7hP 8Egw== X-Gm-Message-State: AOJu0YzK5ZW0soBpg+cD8kTnZacaOwuDTfhKQkv8gb23sfPnvA3B1Hks guc40ed20vlU5aPH5utQEVWF03iXCvJ+QcVAKWLYK1qoDWAGGtOxWAAXUxVUVuw7+8HrobXT4JU ttA== X-Received: by 2002:a05:6512:2245:b0:52d:9ad6:f57 with SMTP id 2adb3069b0e04-52d9ad610b2mr2171057e87.53.1719399459102; Wed, 26 Jun 2024 03:57:39 -0700 (PDT) Received: from localhost (host-114-191.parnet.fi. [77.234.114.191]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52cd94d7597sm1442590e87.284.2024.06.26.03.57.38 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 26 Jun 2024 03:57:38 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 13:57:34 +0300 Message-Id: <20240626105738.58427-1-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/5] hlsenc: Fix the return value accumulation in append_single_file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uEYZHKIA8dQS Both the read_byte variable (which is accumulated into append_single_file) and the return value are int64_t; give the ret variable the right corresponding type too. --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f5c0243cf1..3d5eb47e84 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2380,7 +2380,7 @@ static int hls_init_file_resend(AVFormatContext *s, VariantStream *vs) static int64_t append_single_file(AVFormatContext *s, VariantStream *vs) { - int ret = 0; + int64_t ret = 0; int64_t read_byte = 0; int64_t total_size = 0; char *filename = NULL;