From patchwork Sat Jun 24 08:32:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 4099 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp41455vsb; Sat, 24 Jun 2017 01:32:27 -0700 (PDT) X-Received: by 10.28.21.80 with SMTP id 77mr7742011wmv.79.1498293147507; Sat, 24 Jun 2017 01:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498293147; cv=none; d=google.com; s=arc-20160816; b=RI4b40LGamVc7Lb/rMl4Scqk2oRPh0Sp/0k0b3sxXUGDXcPFCnDkufAowqEyonGejN 6v3H8sYq9y5ya005Lea2ombSXn1mnytY1ESw4lwG89a6cwPNYC1LmbtqHKw7pNkjzSCE EYCdbR8FZ6irV3NcaOhct84nQhlSzwT8Dti1CoXyFVWoqYRoNFn6Ihu8bJ6LOYwQH1Bc LmR5G/v7CZjiysaBUUuA06lO72Yn9p9MIJHulGUMAOoN1zBBtuWYu0Ty6EboQ8H7wGtM c225mBYUxYQx8bp9VQgKN/zDlpV69s3Ung4hM7js4Tz1qsyPNV2EqgqnPmAm9cq+F8x6 yhqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=3rvNj7wx7cqMTn4AVsU9ExpyJ5lTKtvU7Q9Jv8VCh+0=; b=FTsImorMCipGKKJcXlhPufWyOXX2hviQJ1UxOyM07Q0kxjLAuALRjs9bBUGZKlDvA4 ZjsBKKwKqddP4tB5IpLP1Kdkbq7B9wsrxZSY1sEFXAyUOvUKIHV80qE2ZYi25buoNF7v 2M4u2+9xoELdG2RBGxwfgdMQphv56WvlXuwDzw4EevaCWmoF6GQx7LpyuVv+UfZsrG+t 3CO1VvK6rMlMZMzmJgZeVOVOaCpXlY9Bzy28UeBgIfsQ9RTjJtTHINVD6f+alkfCVF6e 1MPyna9ycJoxbAGiIi63XZjy9BKADYjt9Ok2tBLZz0qW5o+3jsFStb37GK4r4x2MuWhb 27KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Ol1HpNqs; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k80si6136451wmd.112.2017.06.24.01.32.26; Sat, 24 Jun 2017 01:32:27 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Ol1HpNqs; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87D65689880; Sat, 24 Jun 2017 11:32:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CD03689880 for ; Sat, 24 Jun 2017 11:32:16 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id k67so17801400wrc.1 for ; Sat, 24 Jun 2017 01:32:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=H0ZNLA0YAr9sOUX6Z3tiTbuJpBCvKCqbVk5kmp6496s=; b=Ol1HpNqsUTNscIM7JuNbWKVwwPi1tSs3At/EUFIc0CD68TmCgeUz7IhQciZ9yi2AZM m3Kw/nZviaP2SecSU/NhEtHZvqlzRcpLEcecUS7zhUTsVuGgeZSnsO6bSg7uVQWDgyy3 40HAm4KyXr1CMNLm10d/3Iq4D4zjLIefnI4ImZYmtDoEQFRWaEUYrhVXxkTNBa4EcWTb FT0QmIJ8B7NsnfWMdp2o+TFOfB4P1NeTjNyJqjDLl19ShPAMaZ4rebeEGxNPwhIUcwKh lhf0k5tEUHfNEScD/yps1xIgIySq4MWEgpnjF3TTXBI1khyyOyuQQqo+Dz0LM9jR+pxz lqDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=H0ZNLA0YAr9sOUX6Z3tiTbuJpBCvKCqbVk5kmp6496s=; b=gzj8pIh3zrM8VMJDCrHCX6CZ+spZdrod9u7uh2siV6J4z0dIgDXuraqLWjOv6AeoCV T17YE45ofuebf5Tvs2U+CZoy586oCujtgYSggS7EJipM5eMy/QRqpHg1cDI7UGhfKjXF I7oz3VrycFJJ81qkrd7zkfG5f7iMNgA6kdXbJ059i7TyZouPY5IvuB+pUmFpEWMBFvqm L7P4SwY2IgP4YqekDr2ZKd1X0hG0SRB3znpo1X/91RvJYbIX85Bwz2/t8QfneAnXvNIv sGMO4pUsTFpvxZTGVdi8pxuEbEVmACLXLGrONojKWcX9Mc5qMksZtpvdFB/nn3Lu6Etb e2ZA== X-Gm-Message-State: AKS2vOwUjdCZgXZnM5cfIZaGXv2AdJRaFzohJTHGIrrHtxFTw5+0arYl xX6+WBIyy7m/gtr0 X-Received: by 10.223.151.216 with SMTP id t24mr8541511wrb.40.1498293136444; Sat, 24 Jun 2017 01:32:16 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id f45sm9768002wrf.2.2017.06.24.01.32.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Jun 2017 01:32:15 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Jun 2017 10:32:05 +0200 Message-Id: <20170624083205.18934-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_overlay: remove rgb option 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Its been deprecated for over 3 years. Signed-off-by: Paul B Mahol --- libavfilter/vf_overlay.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index adbf633..beb61c1 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -112,7 +112,6 @@ typedef struct OverlayContext { const AVClass *class; int x, y; ///< position of overlaid picture - int allow_packed_rgb; uint8_t main_is_packed_rgb; uint8_t main_rgba_map[4]; uint8_t main_has_alpha; @@ -795,11 +794,6 @@ static av_cold int init(AVFilterContext *ctx) { OverlayContext *s = ctx->priv; - if (s->allow_packed_rgb) { - av_log(ctx, AV_LOG_WARNING, - "The rgb option is deprecated and is overriding the format option, use format instead\n"); - s->format = OVERLAY_FORMAT_RGB; - } if (!s->dinput.repeatlast || s->eof_action == EOF_ACTION_PASS) { s->dinput.repeatlast = 0; s->eof_action = EOF_ACTION_PASS; @@ -828,7 +822,6 @@ static const AVOption overlay_options[] = { { "eval", "specify when to evaluate expressions", OFFSET(eval_mode), AV_OPT_TYPE_INT, {.i64 = EVAL_MODE_FRAME}, 0, EVAL_MODE_NB-1, FLAGS, "eval" }, { "init", "eval expressions once during initialization", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_INIT}, .flags = FLAGS, .unit = "eval" }, { "frame", "eval expressions per-frame", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = FLAGS, .unit = "eval" }, - { "rgb", "force packed RGB in input and output (deprecated)", OFFSET(allow_packed_rgb), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, { "shortest", "force termination when the shortest input terminates", OFFSET(dinput.shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "format", "set output format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=OVERLAY_FORMAT_YUV420}, 0, OVERLAY_FORMAT_NB-1, FLAGS, "format" }, { "yuv420", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV420}, .flags = FLAGS, .unit = "format" },