From patchwork Sun Nov 29 02:20:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24142 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 B04C044A395 for ; Sun, 29 Nov 2020 04:48:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 804E46880FE; Sun, 29 Nov 2020 04:48:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A62916807B4 for ; Sun, 29 Nov 2020 04:48:52 +0200 (EET) Received: by mail-oi1-f193.google.com with SMTP id v202so10370880oia.9 for ; Sat, 28 Nov 2020 18:48:52 -0800 (PST) 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; bh=DE+bJmBk3haj6274fzncBhJ78+b3N8jPNdB9MFyvOTc=; b=EIMrYXOc2c1vLTECyBaYEnlEYWq3BvbxJRi74MjlFlljRG3oARN0w+MuY6MimXTphE wbn/4babmsxXJmMqU2FECc9hcJ139+VkeT27IqtIjmWlitUoUIDpRqP85ZbeIj22Oozz zZCO8AdWOksivVpnGs9gExZBjx6bdFkxWER1WC/Dk1d79YGbuMH+lln8VGQhY6eC2Djx IoFqDCvBgv1CLZ9nbqiRSi8qMdwRSK7mcPOmupbQ6Sgo1ExWq4IxKJnRdDQiClN4Sa0H 7mti+ghrTnIAWGou34MY8ITYhGGU+9J1k00zLIsv13hY5mHcdBm7WJU3uzCSDLXUeJuc TvhQ== 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; bh=DE+bJmBk3haj6274fzncBhJ78+b3N8jPNdB9MFyvOTc=; b=FMR2fdWvof6BNLoitvXPoG9UnB9uXiLiQX9FanQUcEL+Ei1k87zF1BSyR5OJonZRrD 2XnsqDb7JVwUC/zrpsjWB/9FH+sVASTidhsWZCC+YdESPZAyJJyzMIQRUU+O9b6yM+M1 icBfBsl2BcT0kSWXTokj2ubT5Z4ien/hhEjBOnSno4x95bwjwlLM+BRiijHvygriqZ6R 4uvN8y7qtsEJj2qERXucdIjvq41jsSJ3M9v+vbUP5hB8JYF6YhN/4+bvnqCAwi62qAE1 3mtKpEVCJDcHaGEW2BJobhDVKi5gx+8zfjfD7yyAZfXc0Uf7bj95Mgo0HjJ9afn6GQcl QG8w== X-Gm-Message-State: AOAM530kOhH482qXXwvjEGhBXFtUZIb/pJnJHsGrCPBj3yjiS7RjXOMy nvZDTyTvzbrCDlXB3hyIPxefbpb4xCo44Q== X-Google-Smtp-Source: ABdhPJwkQMCgKps9bqXWWRtQC0BGCa6p1NxcxDBFNOBva0pNwsWSsbAhQVHmBP0+y/Y3Ja3R+FY6UA== X-Received: by 2002:a17:90b:ec7:: with SMTP id gz7mr13464342pjb.210.1606616424071; Sat, 28 Nov 2020 18:20:24 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id e2sm15473245pjv.10.2020.11.28.18.20.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Nov 2020 18:20:23 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Nov 2020 10:20:11 +0800 Message-Id: <1606616411-2082-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1605924448-26279-2-git-send-email-lance.lmwang@gmail.com> References: <1605924448-26279-2-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH] avdevice/decklink: remove the duplicated warning 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang ./ffmpeg -list_devices true -f decklink -i dummy [Blackmagic DeckLink indev @ 0x2f96d00] The "list_devices" option is deprecated: list available devices [decklink @ 0x2f96400] The -list_devices option is deprecated and will be removed. Please use ffmpeg -sources decklink instead. -> [Blackmagic DeckLink indev @ 0x306ed00] The "list_devices" option is deprecated: use -sources decklink instead Signed-off-by: Limin Wang --- libavdevice/decklink_dec.cpp | 1 - libavdevice/decklink_dec_c.c | 2 +- libavdevice/decklink_enc.cpp | 1 - libavdevice/decklink_enc_c.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 2e41b58..072f8a1 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1179,7 +1179,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) /* List available devices. */ if (ctx->list_devices) { - av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sources decklink instead.\n"); ff_decklink_list_devices_legacy(avctx, 1, 0); return AVERROR_EXIT; } diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c index 60b7186..7e2f03f 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -30,7 +30,7 @@ #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { - { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_BOOL , { .i64 = 0 }, 0, 1, DEC | AV_OPT_FLAG_DEPRECATED}, + { "list_devices", "use -sources decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC | AV_OPT_FLAG_DEPRECATED}, { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, DEC }, { "format_code", "set format by fourcc" , OFFSET(format_code), AV_OPT_TYPE_STRING, { .str = NULL}, 0, 0, DEC }, { "raw_format", "pixel format to be returned by the card when capturing" , OFFSET(raw_format), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 5, DEC, "raw_format" }, diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 883fdea..04b06ae 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -568,7 +568,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) /* List available devices and exit. */ if (ctx->list_devices) { - av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sinks decklink instead.\n"); ff_decklink_list_devices_legacy(avctx, 0, 1); return AVERROR_EXIT; } diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c index 6cc0743..5a052c8 100644 --- a/libavdevice/decklink_enc_c.c +++ b/libavdevice/decklink_enc_c.c @@ -28,7 +28,7 @@ #define OFFSET(x) offsetof(struct decklink_cctx, x) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_BOOL , { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, + { "list_devices", "use -sinks decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, ENC }, { "preroll" , "video preroll in seconds", OFFSET(preroll ), AV_OPT_TYPE_DOUBLE, { .dbl = 0.5 }, 0, 5, ENC }, { "duplex_mode" , "duplex mode" , OFFSET(duplex_mode ), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 2, ENC, "duplex_mode"},