From patchwork Fri Jan 31 23:37:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 17636 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 1D28D44AE43 for ; Sat, 1 Feb 2020 01:37:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F06BF68AD2B; Sat, 1 Feb 2020 01:37:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D397C68AB42 for ; Sat, 1 Feb 2020 01:37:13 +0200 (EET) X-QQ-mid: bizesmtp22t1580513827thl3bnmd Received: from localhost (unknown [116.116.252.129]) by esmtp6.qq.com (ESMTP) with id ; Sat, 01 Feb 2020 07:37:06 +0800 (CST) X-QQ-SSF: 01100000002000K0ZTF0B00A0000000 X-QQ-FEAT: Tf10PgKjoHxBduJlVkJK89oreqo/2DD6fwkILJsgmWDPvbvYABp5Py/C//Gmr muF9qvisMCCTJVOViT1MFA8AKP1tt70AFzNPONSk8wuQ1eq0zRbsSRegMyT2I7XPVF3ZVIl 3ganGPjIJZgAnAccRYzwcb1TRknM2ICtafm9vwmwjrmUMjY6A0dLYTNHWDrEyuKnNat2Smy gm8tOLEzBAGzOD518+j1g/7rjfRqkRIjK7y4OZyXE2gG8aahzpyf/rG6H+Ai7ezuYkLMyw3 gMDbmyK29Q/ednFJ0STwh0BKE4zxhGlYKIlupge6nQSTTFLDpJ2hu41DU= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Feb 2020 07:37:04 +0800 Message-Id: <20200131233704.38591-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign5 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] fftools/cmdutils: add no demuxer/muxer name specified message 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- fftools/cmdutils.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index f0f2b4fde4..6e387ccb10 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1854,8 +1854,14 @@ static void show_help_codec(const char *name, int encoder) static void show_help_demuxer(const char *name) { - const AVInputFormat *fmt = av_find_input_format(name); + const AVInputFormat *fmt = NULL; + if (!name) { + av_log(NULL, AV_LOG_ERROR, "No demuxer name specified.\n"); + return; + } + + fmt = av_find_input_format(name); if (!fmt) { av_log(NULL, AV_LOG_ERROR, "Unknown format '%s'.\n", name); return; @@ -1891,8 +1897,13 @@ static void show_help_protocol(const char *name) static void show_help_muxer(const char *name) { const AVCodecDescriptor *desc; - const AVOutputFormat *fmt = av_guess_format(name, NULL, NULL); + const AVOutputFormat *fmt = NULL; + if (!name) { + av_log(NULL, AV_LOG_ERROR, "No muxer name specified.\n"); + return; + } + fmt = av_guess_format(name, NULL, NULL); if (!fmt) { av_log(NULL, AV_LOG_ERROR, "Unknown format '%s'.\n", name); return;