From patchwork Tue Mar 15 09:05:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 34749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2837643nkb; Tue, 15 Mar 2022 02:07:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo9aUUgf8yW6F6PZ1/Ow5Lw0BMxYZy1ljYKViBqJlVh6by3fCi28XXnXLm/iSJGsK84tOd X-Received: by 2002:a17:906:1ece:b0:6ce:e14:6d92 with SMTP id m14-20020a1709061ece00b006ce0e146d92mr22076773ejj.408.1647335231051; Tue, 15 Mar 2022 02:07:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647335231; cv=none; d=google.com; s=arc-20160816; b=UCCEohFkLqpSRbKBESNxamj/RRpa2vH5+dqYujqrltdG6zBKmJa3n0mfUbpA2b6LTV xvK/FCvZM0U7s1o4jy0+G7kRScASVS/oLXBVvkPpkBd74lSElPFDPtqcVGKoMt872DA/ NolKIFIlmV/USKdS0THP+GQe6eBzpPNnSfjoCJGG1R5zJFwAGXSsin5lKRBKMqt3UcBv r+jY1/Kcfz0oO8WyygMxFob4ot5yckgF3/Udd9Yx9OPHHunU9rkrd6TikvZBKD4KSKI+ G93T1BXxsj8rHsEaIQMMCqxZdv4tM4LD7orjxjIh+WYOPqDKjM+gpqkKii4twoPZEne6 Urjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=0lFnP7trUhFpxaheBrHioZhToig0DEVnFGEPI9bCT0c=; b=G8JkxCPSvlEbTWiTN7YG+LLsqONhefFljbnCrexEegwmZdasI4aByRHpfQox/Mr0ea Vyp7MQwXUyvEb6XEp2Kx4NJDGLnYa1/SwepPS1lP9gT0gIY3LasAJHDpaJwwstEYOsc+ 3QBXD3/2wxVKwZrV1QL8OUELbgPuiw04+Su/LVsPqBE008fAGdpbTMqvjIaSnOKAQ7CI iByFLRbDXSIiLFcEznuLzgq3M3DAbqtU7W/RLZwxqKSPwmh4mXeQqwDLA0yocv3Qly7B 9VOTwxO0W84AiQdMAj4rTdsi6R1YIjfzs5psgyWajIScHre+UfeVjbZ1Pp9lXjrJlBvw SBuw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h22-20020a056402281600b0041865d2c996si5792109ede.212.2022.03.15.02.07.10; Tue, 15 Mar 2022 02:07:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A90C68B212; Tue, 15 Mar 2022 11:06:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3AA368B1E6 for ; Tue, 15 Mar 2022 11:05:53 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 50B2924017C for ; Tue, 15 Mar 2022 10:05:52 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id QEwZL053NIbD for ; Tue, 15 Mar 2022 10:05:51 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id A7F16240507 for ; Tue, 15 Mar 2022 10:05:46 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 20BB73A07AE; Tue, 15 Mar 2022 10:05:46 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 10:05:29 +0100 Message-Id: <20220315090532.27295-7-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220315090532.27295-1-anton@khirnov.net> References: <20220315090532.27295-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10] fftools/ffplay: drop options deprecated since 2011 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: PYF6G8RAwMAB --- doc/ffplay.texi | 8 -------- fftools/ffplay.c | 14 -------------- 2 files changed, 22 deletions(-) diff --git a/doc/ffplay.texi b/doc/ffplay.texi index e187b5852e..0f090128f2 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -34,10 +34,6 @@ various FFmpeg APIs. Force displayed width. @item -y @var{height} Force displayed height. -@item -s @var{size} -Set frame size (WxH or abbreviation), needed for videos which do -not contain a header with the frame size like raw YUV. This option -has been deprecated in favor of private options, try -video_size. @item -fs Start in fullscreen mode. @item -an @@ -126,10 +122,6 @@ Read @var{input_url}. @section Advanced options @table @option -@item -pix_fmt @var{format} -Set pixel format. -This option has been deprecated in favor of private options, try -pixel_format. - @item -stats Print several playback statistics, in particular show the stream duration, the codec parameters, the current position in the stream and diff --git a/fftools/ffplay.c b/fftools/ffplay.c index c929ce32ed..38df91f72e 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3471,12 +3471,6 @@ static void event_loop(VideoState *cur_stream) } } -static int opt_frame_size(void *optctx, const char *opt, const char *arg) -{ - av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n"); - return opt_default(NULL, "video_size", arg); -} - static int opt_width(void *optctx, const char *opt, const char *arg) { screen_width = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX); @@ -3499,12 +3493,6 @@ static int opt_format(void *optctx, const char *opt, const char *arg) return 0; } -static int opt_frame_pix_fmt(void *optctx, const char *opt, const char *arg) -{ - av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n"); - return opt_default(NULL, "pixel_format", arg); -} - static int opt_sync(void *optctx, const char *opt, const char *arg) { if (!strcmp(arg, "audio")) @@ -3582,7 +3570,6 @@ static const OptionDef options[] = { CMDUTILS_COMMON_OPTIONS { "x", HAS_ARG, { .func_arg = opt_width }, "force displayed width", "width" }, { "y", HAS_ARG, { .func_arg = opt_height }, "force displayed height", "height" }, - { "s", HAS_ARG | OPT_VIDEO, { .func_arg = opt_frame_size }, "set frame size (WxH or abbreviation)", "size" }, { "fs", OPT_BOOL, { &is_full_screen }, "force full screen" }, { "an", OPT_BOOL, { &audio_disable }, "disable audio" }, { "vn", OPT_BOOL, { &video_disable }, "disable video" }, @@ -3599,7 +3586,6 @@ static const OptionDef options[] = { { "alwaysontop", OPT_BOOL, { &alwaysontop }, "window always on top" }, { "volume", OPT_INT | HAS_ARG, { &startup_volume}, "set startup volume 0=min 100=max", "volume" }, { "f", HAS_ARG, { .func_arg = opt_format }, "force format", "fmt" }, - { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_frame_pix_fmt }, "set pixel format", "format" }, { "stats", OPT_BOOL | OPT_EXPERT, { &show_status }, "show status", "" }, { "fast", OPT_BOOL | OPT_EXPERT, { &fast }, "non spec compliant optimizations", "" }, { "genpts", OPT_BOOL | OPT_EXPERT, { &genpts }, "generate pts", "" },