From patchwork Mon Apr 19 14:18:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27074 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp569092iob; Mon, 19 Apr 2021 07:27:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAe00EmY74UxOeZ27NT8a4fIX0cq3waIVtQAVIXHL5M16B+hEmimsDcf3J0KFxoYrJDY8Q X-Received: by 2002:a50:fe81:: with SMTP id d1mr26635917edt.308.1618842459803; Mon, 19 Apr 2021 07:27:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842459; cv=none; d=google.com; s=arc-20160816; b=Wx2SaX3eEGy5z94wjf1ngxdPDeBsOmKhPwM/eU8ooFdojt7XdlLluPr9/AVfSyrIIi jNfFpF8UI8+hobLRHIODLhIYkKJPpzbUA3qogaXZMsbS2V3U+Buse0t9F9e2GiZFn88n m8BuBMn86F1Z7ZTeEo/OgeilqFJqLhy6qyjpaC6ySA6xwQ9kRJSRgiry54Nv/YemxWas 5bO0WzAYnR7au593rhlPSooi3Nntte8RsaWKqO0wvTwhcKa+1toEYRoTaxS166Icinjd w8r4nS3BaCuMoQM+X3xJMWDlE14LyF1q+jKutA9Qznuu6HWe3K+Ynf/Dj9SDqjtGn1H8 XSgw== 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=8RM36O8M+V4q9U8eexU2bzd2eN/mVopVyzyBQHCpcf0=; b=y9ytBjKSw811vk2RYHTtenZJzmPUj42h3cxkXNjz9qBkPRZvttfIcR1s6j5zVHd0V7 m1jwB6VLe03+cnhKf0uC8Gsxb38eX+G/o0Sz0e3lvgN2+qf5BP797/W1bP9jjSt5wvdc pEQzPCeXdQUID6AxnBesNFCkt3Q7kae7Hgx0P7aw7wGmf0l1J3RBEg8JYeVrV+bA4jdL 7/vi/fIshgDCD+h0jvCjAKCtSrWCanNaTH84jIUNSNQxDfPe2XU82silHojTnERKZl8i dMSss9NOyCLX2ppxr/ufF7fMpRt25Fu3YFeCQ53OAbwKS5g7kVsLaxMLc8jaDbhjYJX+ WYhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tXVu7Lbb; 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 dp21si12228716ejc.61.2021.04.19.07.27.39; Mon, 19 Apr 2021 07:27:39 -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=tXVu7Lbb; 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 9C69268A2B1; Mon, 19 Apr 2021 17:18:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AFC868A2A0 for ; Mon, 19 Apr 2021 17:18:19 +0300 (EEST) Received: by mail-qt1-f169.google.com with SMTP id 18so12735073qtz.6 for ; Mon, 19 Apr 2021 07:18:19 -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=fFCn/hejaMSLfx5xNlBxRCtX5vHO4fruXOob1sfC5OA=; b=tXVu7LbbIcpzxWyn2zX5RZ1ftHLQPEV/cPspWaPwcoCaLc3WFIaDRH0G9hmrQwOBe3 a4nT7JiPIG9RMSC9kJChnTcgFC/2qP1R4mfqaRcA6DUclWrD6bvea+Mc2NakAhyEbZ6Z AzilHYuC9f+Y0um5xHWMBwOCL1MD8yXbDFjEAJBmDNbbx1rSSVegFZOjslBKUcdZhdDF gyfAjB3OZ7Ol2aSJGrf/viCXtKedK3dVTtFEar9ttdzsAOmSH6TVXexYKwqLrRQFtHQ5 0KkxYU3XxsJhsklvB+kPZk8QzzDiiXh8jRdCuqaOw6gjz4IUF2rL9RjqNl1dbckBOa/Q z3XA== 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=fFCn/hejaMSLfx5xNlBxRCtX5vHO4fruXOob1sfC5OA=; b=pzOZayk0NvBv/NmGNLCyLY0XGO0Zi4axdN0s2oPgvEmro1U8Xg7tkXWm5RmI9FncpR Rvq6fDHKIdtLYjHTAJYWhP9U2bCDuHUJb5BsrrlDoMPki4nT3eZcVketsU2vcE1LbgoB WgNLO9ZefW7+PN/ASH6Pbo3joCGridwm+ddciGfz/GO3Vrs/NEoSewtKFko8UXFqs6pB 49P7tlRUtN7+Q6wG7wU+IoAjaRLF+n8gdS0o7QWE2freOekhOuq8vnn6q4G46QW/5S2j n+1iQUXl/OMAdUhSKF4BrtuddeeHMaOyrP8H0HJB6kTGUd1C0il/WWzdI0eAQcejsuUo w9GQ== X-Gm-Message-State: AOAM530OCGA2yLj5xorRHB7CGtK0UNmQiZVUChyw9HReM29JdmLfp9I/ 1Z35EoO9lBqm8lx9SNquJiZcfg2PaF8= X-Received: by 2002:a05:622a:486:: with SMTP id p6mr12098862qtx.98.1618841898099; Mon, 19 Apr 2021 07:18:18 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id l71sm794417qke.27.2021.04.19.07.18.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:18:17 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:18:05 -0300 Message-Id: <20210419141805.8529-1-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 86/87] avcodec: postpone removal of deprecated libopenh264 wrapper options 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: 4Mhb7f/NStRF They were deprecated only a year ago Signed-off-by: James Almer --- libavcodec/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index df2801401f..414cfee1cd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -52,10 +52,10 @@ */ #ifndef FF_API_OPENH264_SLICE_MODE -#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60) #endif #ifndef FF_API_OPENH264_CABAC -#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60) #endif #ifndef FF_API_UNUSED_CODEC_CAPS #define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60)