From patchwork Mon Apr 19 14:09:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27116 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1093938yba; Mon, 19 Apr 2021 07:14:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLoRyty+O4qwVAOgqbglem7Qpahgu/JA7KSJMKsk2TWA8Sfq+2YIObnIFXVKGmooa9Pski X-Received: by 2002:a50:e607:: with SMTP id y7mr26339651edm.18.1618841653384; Mon, 19 Apr 2021 07:14:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841653; cv=none; d=google.com; s=arc-20160816; b=erKgDLeVtWnJADzzCRItH9jaf6o0AyS45SHDHyHJ2/QPwE8XTj8kDwzZ28BSY8mjgI v1+0rMey3KzLxeeiLxwYzwxLaoHY1oY9SJ5efHteDUoF+VumPsPEjhgqTFiAB1qUo2AA u9OsQbqY4Mo40jgf2GK91GKJC0FTXEj48tmJt9SyeU+rjRTfy5Xveo1potqZFdUlJFx4 7mfAYa25j5cO5HuJuuBlHTceqSddxeSReW4nieFAmpmUFMBmATMWspwuFyxvsSU4lF2E xRfLf9qGwk9gA+t5WSo2mSqqQZBSgr2aKQgulO3ezfOo6p0hNj7DoyRDE3F0e9PQGegk c+8A== 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:dkim-signature:delivered-to; bh=UNgCNXCKLk/0Oh5CzQJpiiDyZlvrUx+S2yZNpaT3pKU=; b=q1V0PWcZDy4v7BkP3aaMrPeSxhcsX1fQyIKm8T0Xz4s7f+fFB6sOYu0CO/1/F5RPA3 AMludzf24MK2vrmu4ZZEF3Ubn8FZ9Z3RSNqGeTHRxhCni4ZCQYf3LzzmFRC9TJem/D/6 xbfHB2uLfDBgoiAJhxyh2mFPM8DIKJhOrp/xsE0z7DX0SqFyN/g3Umcg0qT7nKOejy7i X35iUgnuxnhUIw+0mmjq4zBOBq0B33OVQuTSp8H8oLZ2p4y+n7g2L7z0xPBi2lfvQix8 L4GXjYshxvMcQM2LgIs2dBuirHOrHy/Lcdh3OK4dyfJXDFjk2G7rbjqmOnCDabRLViHo cnRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="hV/6P3pe"; 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=QUARANTINE 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 v17si12320344ejj.22.2021.04.19.07.14.13; Mon, 19 Apr 2021 07:14:13 -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.s=20161025 header.b="hV/6P3pe"; 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=QUARANTINE 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 A3E31687F13; Mon, 19 Apr 2021 17:11:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 392AE680CF7 for ; Mon, 19 Apr 2021 17:11:39 +0300 (EEST) Received: by mail-qt1-f172.google.com with SMTP id o2so12710040qtr.4 for ; Mon, 19 Apr 2021 07:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YDa5pxhvZhIl1nJYb4AGqFHuci3S9NxoH4gjSICL4yQ=; b=hV/6P3peWvDvVecmQXYg8ZP/7fyqq7Zt7Ez2efiqlYbW8cEYPL4YwjSfhOmhAsuKsC CalvzMpqZG6vEhrY72Jjg+5yAN35NCVuG8LCgm4PXGEEZPmyWdy1SDSV4f2ngBpTpZif TpS6N5og7qAQ9Pw5m0s+oWr0KWlNXo0HIZVRdld1/8pCZRT5Y760ONK7Yk+QHMJ1DiFd 9gumEWznnBWuOnKMZbqAqHwy1D2AdriMdGW6DCNdC7ZG/jUmTI2BRbMZccuP074wLF0m tpQ5frFugQEKDXsLUj89BxiVyCjYgdS6ikQwE1BrZ337KlHorHAEAl0dpOM1z6ClwuAg GkfA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=YDa5pxhvZhIl1nJYb4AGqFHuci3S9NxoH4gjSICL4yQ=; b=R/nST60zFyQqqH+bcXZ4ynDNjTgurac1+rHhrtygQzm17cDWTYB4UOZlqkEWf/BBf4 vC3iSMaKJmeWQ8us7LKeu/n1q2sL/TYRbzU7VNE4R9CXNdGfMj1e+7z/5Nmzw2OMKbqX M7cRgZnG4TI5R4Yudnm9grAldCrWPM9jnQj0/Cvlo7eB/ZEJwA2ldqC6WS/1nciWqlif BLS5mWy6fIDwmDBkYXEfVXvmJW/GCn6kBpBmTfmsIGEcnJI3jrdEYhnAtBjoOQMgaFjz qwH+bB4aAMRuuxwgH43R1FYNNCnQXn4O/YXwdQl6r5U4SS9oAGMUoPnrFFx10UDPkxdI 4zzQ== X-Gm-Message-State: AOAM530PlEhN7MBZGlSD6YieMyEEOGywWmaofZ1kcFnCLdRk+l9fSLLh 4qO2BX7K2a8G1NWhfAKhvqO5doV06q0= X-Received: by 2002:a05:622a:1044:: with SMTP id f4mr12285237qte.224.1618841497904; Mon, 19 Apr 2021 07:11:37 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:37 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:27 -0300 Message-Id: <20210419141024.8174-31-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 30/87] avcodec/mpegvideo: Remove deprecated rc_strategy option 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: Zi33gElgtq+O Content-Length: 3116 From: Andreas Rheinhardt Deprecated in d05c3b9ceeb9d00d4500c376448230e45f6ab108. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 12 ------------ libavcodec/version.h | 3 --- 2 files changed, 15 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 30dcf99188..75e343838a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -369,9 +369,6 @@ typedef struct MpegEncContext { uint8_t *mb_info_ptr; int mb_info_size; int ehc_mode; -#if FF_API_MPV_RC_STRATEGY - int rc_strategy; ///< deprecated -#endif /* H.263+ specific */ int umvplus; ///< == H.263+ && unrestricted_mv @@ -617,14 +614,6 @@ typedef struct MpegEncContext { #ifndef FF_MPV_OFFSET #define FF_MPV_OFFSET(x) offsetof(MpegEncContext, x) #endif -#if FF_API_MPV_RC_STRATEGY -#define FF_MPV_RC_STRATEGY_OPTS \ -{"rc_strategy", "ratecontrol method", FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, \ - { "ffmpeg", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, \ - { "xvid", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, -#else -#define FF_MPV_RC_STRATEGY_OPTS -#endif #define FF_MPV_OPT_FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) #define FF_MPV_COMMON_OPTS \ FF_MPV_OPT_CMP_FUNC, \ @@ -672,7 +661,6 @@ FF_MPV_OPT_CMP_FUNC, \ {"mepc", "Motion estimation bitrate penalty compensation (1.0 = 256)", FF_MPV_OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"mepre", "pre motion estimation", FF_MPV_OFFSET(me_pre), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"intra_penalty", "Penalty for intra blocks in block decision", FF_MPV_OFFSET(intra_penalty), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX/2, FF_MPV_OPT_FLAGS }, \ -FF_MPV_RC_STRATEGY_OPTS #define FF_MPV_COMMON_BFRAME_OPTS \ {"b_strategy", "Strategy to choose between I/P/B-frames", FF_MPV_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS }, \ diff --git a/libavcodec/version.h b/libavcodec/version.h index da36f1790d..552e5a7c5d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -69,9 +69,6 @@ #ifndef FF_API_OLD_ENCDEC #define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_MPV_RC_STRATEGY -#define FF_API_MPV_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_PARSER_CHANGE #define FF_API_PARSER_CHANGE (LIBAVCODEC_VERSION_MAJOR < 59) #endif