From patchwork Wed Jan 15 13:50:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 17370 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 C2B96448D4F for ; Wed, 15 Jan 2020 15:50:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9636C68AF4E; Wed, 15 Jan 2020 15:50:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC86268A6CE for ; Wed, 15 Jan 2020 15:50:45 +0200 (EET) Received: by mail-il1-f169.google.com with SMTP id f10so14862277ils.8 for ; Wed, 15 Jan 2020 05:50:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Xref755KeCMfkNMWHJWorE/lGlMohxJZLXNmfDNdLAE=; b=JZ0pGa9zwPvElO2oSyzCyMo7knNhqtIRUsdTkiaoWauCPD5qWZohTGO1ExvnHejB0X VjTNgCRiDv8cFz56/UEs+tGpJ/6Woxkac1iQ+WO30D7Ixz0XUbZHaTqitoO4PTzi2zn6 nDs+UuRSUEjg3lbGMqyPCXVR8c5NdMUqxjWa+vF8nFG6SwPQRxeBtRWDqlYy1tXP1GDd rAQvJah9sC8TDCnR851XpL+z5whxMoH/HkH9LQ/HkPEOnkerpAiCKl2N0uXiL4Ug9CP9 zuw6VOBuv3svhwwmrToxbp3FDY0S9WfVJtTR12QotoPI5l3ePAv5VQ4KkiwE7qicz1wF TInw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Xref755KeCMfkNMWHJWorE/lGlMohxJZLXNmfDNdLAE=; b=aXu5ZHoRgLOdDnHB/YCTr/R4QpU3q8Tvpl/iJMoTN/KcD0brMPlbJdTHNwwjCVS2cc AEFq2yhKUaG9h0JtyjjuINIimCLVxUI8SE7d8FYUP6J9sSCAVNFeGRP1nSZJT7mUjjjA 6MNIrp3HA29g2Bvmc/PqqDrtiefJ1vHLV2kUFFqq9vqnXmrsHfHfmeXZCzwJXtenJ/0l NnQJqDeM14B/FBg342FOxubPGtL7xQfm/JhfRP7ISBRG85GnzGLq8nl5l6V5SjXqRBpd f7XrTvDE34QhQl+pQZrETIS7c83q/91X4zq7aQ0txIhE+A7/BwwVc1WN0SLaxBIsqo9P qaXQ== X-Gm-Message-State: APjAAAWIdNPXkiT81H6i+B7gNd/b2e14nNb5c8t/TWFBqwWeOJyRWr9H hrD1T4FN30FUmZ9P3ZknGgV2Uzd5hZMDklD9BaDX5g== X-Google-Smtp-Source: APXvYqxedO1p4HKBMEcUZpUy/Mdk+4El+fbhJyx7zodDSkmvJKJ2vkXs5d0nMn7/GY7ch4Z23wAZsdbYdxXQvPkIkiE= X-Received: by 2002:a05:6e02:4d2:: with SMTP id f18mr3366792ils.54.1579096244192; Wed, 15 Jan 2020 05:50:44 -0800 (PST) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Wed, 15 Jan 2020 14:50:33 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]ffmpeg: Do not exit if alleged error was only worth a debug information 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes hard-to-understand behaviour of ffmpeg for some mp4 input files, a hard exit following a debug message. Please comment, Carl Eugen From b4b6d426fadacef4b1e912e8be6d06520093a955 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 15 Jan 2020 14:48:02 +0100 Subject: [PATCH] ffmpeg: Do not exit if alleged error was only worth a debug information. Reported-by: Forum user NewPlaza --- fftools/ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6bcd7b94d2..c5be7fdfb6 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -783,7 +783,7 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u av_log(s, loglevel, "Non-monotonous DTS in output stream " "%d:%d; previous: %"PRId64", current: %"PRId64"; ", ost->file_index, ost->st->index, ost->last_mux_dts, pkt->dts); - if (exit_on_error) { + if (exit_on_error && loglevel > AV_LOG_DEBUG) { av_log(NULL, AV_LOG_FATAL, "aborting.\n"); exit_program(1); } -- 2.23.0