From patchwork Mon Apr 13 14:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18915 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 F232D44B8FC for ; Mon, 13 Apr 2020 17:07:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC83668B936; Mon, 13 Apr 2020 17:07:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A429468B72B for ; Mon, 13 Apr 2020 17:07:52 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id c23so4493911pgj.3 for ; Mon, 13 Apr 2020 07:07: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=PMqFy9n4d8D+xBbgGkzZlSQoKq59JV8atYn74tJoIMs=; b=cWRmz4thkAr3dfGhpNq73OhVH2/VpbWEGF14xYyFqHXKih2OTCLDUIWDtIKP23y+mR qmlMvxmrSq8OgIWpSgKL294OJAv7AnFwlIB7p/bDI9KSapojpWBm3O1RBzHUTRVmhAO2 ZXX0kxmvvoU39ESmdfOOGOABvpKu/VA4rYahQX3LRdQaB7Xe4MNlIamisCxQUCUyhWZw zFU0s2IK5J4c9JM2jFFjdRXlBAMHuRXVgerWJlicT2AAcngpVRJTy1R+jnzNcVIL8gMZ PPirFcbz0eyyaiHiyXfy84O5FvGhfqCkbgAnPL8w8qWTNbT1Jov3hN24Ltgv4kJuUSJ+ y5Cg== 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=PMqFy9n4d8D+xBbgGkzZlSQoKq59JV8atYn74tJoIMs=; b=LDDcmvHSV2qW5TX/mXqHInZGp9dqzmIzBN/JuvChpoUMhUGFkhmCRVvXS3cUaHb3Fd gcdC/71Nmwl9Hufenp3IVuMJGeWNFMD7hbAaM68aMw9sDDmyYYceSlRdtDwZKyMahmzA vFCP4eq37QZvV+aijdBtk1jxu8VqmjeVrpBIqXVOLWKZCKq4jed8PcQ3Q998osruBzNr RoskFp2YvyFJxOKcQ24madOlvpqIRFdsx+Mxx25LgVZ/ZKazNriN/o2nNgU0I+7mZhJ3 UP2XrQ/wArMsWdnEmjFLTkHLaOqV4NSIwS2O1+gMENfnQROuo5/mIFmXjaxDYdcQmR7F Qwug== X-Gm-Message-State: AGi0PuZccCazmn4000mBoy/Lnuuluuv39Nk6++5/McrN4mKrX78JGv0j 6IuzQaDZN/DF66eQBqhcfne8BaPRiXI= X-Google-Smtp-Source: APiQypLWQ4okkpf7MtwGc9b6EqxiMvlw9KppskdHkBGFGFHDCIaGBuogn70krNeMoF91zoft2W678g== X-Received: by 2002:a63:7a0e:: with SMTP id v14mr16602792pgc.276.1586786870751; Mon, 13 Apr 2020 07:07:50 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id r28sm2461925pfg.186.2020.04.13.07.07.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2020 07:07:50 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Apr 2020 22:07:36 +0800 Message-Id: <1586786856-14262-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH v3] fftools: fix hwaccels option dump redundancy 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" From: Jun Zhao When QSV is enabled in FFmpeg, the command "ffmpeg -hwaccels" shows a duplicate entry in acceleration methods for QSV: Hardware acceleration methods: vaapi qsv drm opencl qsv Signed-off-by: Jun Zhao --- fftools/ffmpeg_opt.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 95001a9..93b3d96 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -233,14 +233,11 @@ static void init_options(OptionsContext *o) static int show_hwaccels(void *optctx, const char *opt, const char *arg) { enum AVHWDeviceType type = AV_HWDEVICE_TYPE_NONE; - int i; printf("Hardware acceleration methods:\n"); while ((type = av_hwdevice_iterate_types(type)) != AV_HWDEVICE_TYPE_NONE) printf("%s\n", av_hwdevice_get_type_name(type)); - for (i = 0; hwaccels[i].name; i++) - printf("%s\n", hwaccels[i].name); printf("\n"); return 0; } @@ -936,8 +933,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) AV_HWDEVICE_TYPE_NONE) av_log(NULL, AV_LOG_FATAL, "%s ", av_hwdevice_get_type_name(type)); - for (i = 0; hwaccels[i].name; i++) - av_log(NULL, AV_LOG_FATAL, "%s ", hwaccels[i].name); av_log(NULL, AV_LOG_FATAL, "\n"); exit_program(1); }