From patchwork Mon Sep 7 02:49:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22140 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 6775044BB3D for ; Mon, 7 Sep 2020 05:51:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 528E068A9AA; Mon, 7 Sep 2020 05:51:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F7E768A545 for ; Mon, 7 Sep 2020 05:51:14 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id i26so16158689ejb.12 for ; Sun, 06 Sep 2020 19:51:14 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=247A9ZGsHgl1ba+68Te6D54URwQGzu0xvzRBysxJK/Y=; b=j6HS8gVq0U4MF/ktTTfmpcCNjp+jZjqOri7y3Q35u2s8Ww4nMsZgrFtrPRdygzDPgV jROMpmo6BH7qEMSyKB24xm/8PY5hCP+AN/vlYTGpid6C5en0D1xiqTrzk8eNezY2CZPJ Dl1etUx4qx9v4LInZoZlwuZSpeBXqX49Hpk39/L/Tet+44B3bVMTcprYwMkewCapr15D a6ckov2modTF2muAOpxLLQpMyZpaEBztOXAIdn9hNvfAIA4D0CRljFZSh3I6yoXFBhAi 7fwGCUSLnEDvf0pchFo7UrJ9oQFkx8mhwQ9R74Vbwe+ZqNKPs3zs1zIcPEWTnjtQs0ku 3cPw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=247A9ZGsHgl1ba+68Te6D54URwQGzu0xvzRBysxJK/Y=; b=BX+YCMNGuF4urXvoXSTjxH4EQuCPZS294uXN3xRy3lPNbmsiXTpDDDc8zw7EJ7KOpd LnoqyDMvgjjMHSpPh/k50ovgV/6aTFc8+04/0xwmW3+v3iiTcgJUrrhMeyQYKTStHtY0 dR1uxY+BwPAp5u8lWJyv8Uml2SKNsRwgRKAizIg6yzRpPI3diOW4Bx1DdGYZ3lxHnPxa FtjxeaCbblFPEDGssv5LD+CvWYUgRm9U0g5t+mo/4vdnxiRjJmYX5/HAu/EIDeWuWkzV fdQhUpQ+5BZ9aXcnh4GzWsx1QdnhDAkQA3nO/xCvn5WP4jblK8eF/royJqldFinoW3vC 8m/A== X-Gm-Message-State: AOAM5312QfXpc4OyqIl89V5d3JdUolrzvxQCxmiYiItPFugdj5Uoybwj NOJSutqHUNt4cjpw2b2jj44fRh46OHY= X-Google-Smtp-Source: ABdhPJxrwGSQLx167jfSHbNFvUjmuu3V3/zwf+H8NWknsLowdfwH765tX79cwveHe0epT7SVvKLpIg== X-Received: by 2002:a17:906:4c81:: with SMTP id q1mr18383910eju.72.1599447073394; Sun, 06 Sep 2020 19:51:13 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id a15sm13802048eje.16.2020.09.06.19.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 19:51:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Sep 2020 04:49:51 +0200 Message-Id: <20200907024952.11697-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200907024952.11697-1-andreas.rheinhardt@gmail.com> References: <20200907024952.11697-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] avformat/segment: Fix error messages 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" Signed-off-by: Andreas Rheinhardt --- libavformat/segment.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 0253b750b8..3dcbda6957 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -511,7 +511,7 @@ static int parse_times(void *log_ctx, int64_t **times, int *nb_times, /* check on monotonicity */ if (i && (*times)[i-1] > (*times)[i]) { av_log(log_ctx, AV_LOG_ERROR, - "Specified time %f is greater than the following time %f\n", + "Specified time %f is smaller than the last time %f\n", (float)((*times)[i])/1000000, (float)((*times)[i-1])/1000000); FAIL(AVERROR(EINVAL)); } @@ -561,7 +561,7 @@ static int parse_frames(void *log_ctx, int **frames, int *nb_frames, f = strtol(fstr, &tailptr, 10); if (*tailptr || f <= 0 || f >= INT_MAX) { av_log(log_ctx, AV_LOG_ERROR, - "Invalid argument '%s', must be a positive integer <= INT64_MAX\n", + "Invalid argument '%s', must be a positive integer < INT_MAX\n", fstr); FAIL(AVERROR(EINVAL)); } @@ -570,7 +570,7 @@ static int parse_frames(void *log_ctx, int **frames, int *nb_frames, /* check on monotonicity */ if (i && (*frames)[i-1] > (*frames)[i]) { av_log(log_ctx, AV_LOG_ERROR, - "Specified frame %d is greater than the following frame %d\n", + "Specified frame %d is smaller than the last frame %d\n", (*frames)[i], (*frames)[i-1]); FAIL(AVERROR(EINVAL)); }