From patchwork Mon Apr 19 14:09:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556784iob; Mon, 19 Apr 2021 07:13:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL67gDEKziavZBa5U+M6dWVm1J2IAuL42nSn1Gf3DKBz1MkzvHC8EdwHQu5Khgs9fYcGPE X-Received: by 2002:a05:6402:1109:: with SMTP id u9mr26290738edv.174.1618841582189; Mon, 19 Apr 2021 07:13:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841582; cv=none; d=google.com; s=arc-20160816; b=bABH7pnT5Bmf4cVZBZiorGsEqSEV8e3l5q/0WAL6LfrKouVxOWPIEuMF5fDtVi/qVT 9wkZtK71l/fpmaPJC21vOt7+b6ycQiQXgRHlIs3/YsyWQ+WT3DRVJPsOs6x64optrOmm 3KbhlVluurTtIjqB0HryWIGOFULbN4DQu6DsXZAJ57M094b9Ef9/UO2v0TCTEXJ4m8Zv L7SQgPMZbBGLTZnHSrAA9PlXi0dKA52ahGB7P04UAwAi9kp49pC8p+xWIqLccXDYGKSM v4V0Y8uedkZcDH6MBNusbyHOM66tsu9ph5uM5ft2hoUzmqV02V+N4rrBHXjkw5De9kAh lOGg== 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=p/kboUYbcqHmR22aIHEfGP6ydX/R5B5oPtj/vEZKXEA=; b=Qx+jtD9bMzgx6VNuwtiFz18UT2wuMRp2ztjC991ZA+lOh4Yk4Xnz//+IQvDYv1EftQ TreXsA+U7iayExjk4wmHi8PTdcCuxufVmWLR+HkcqgRutQ4VXuEHJRqFn58H5bwmx0rs 1gPDGuK2UEIp8Yt/sA5wzWwZ6Pmp18pil1vAhqINfIRRZGdMDX/RNLzv8fszn+v8TFM0 CU30lglEfPdFNkWy0wUvvuHHb1hL4naUn5+HjhkizpLv4QJfBtmutrk/NyOFTETVMx2C Xo3hTSFiC/RBXct364z6lI6txfUYcPUnlO5BhZPUEOq65t8Dr+a6FExB3vGVNB4BfuqK mDWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=scwFy54g; 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 t16si13299181edi.299.2021.04.19.07.13.01; Mon, 19 Apr 2021 07:13:02 -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=scwFy54g; 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 DD430680C0F; Mon, 19 Apr 2021 17:11:31 +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 065CC680B72 for ; Mon, 19 Apr 2021 17:11:29 +0300 (EEST) Received: by mail-qt1-f169.google.com with SMTP id 18so12715449qtz.6 for ; Mon, 19 Apr 2021 07:11:29 -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=unKxoBvpAK6IPgLwXYkW/pWj1LpQAgEKY3aucDiWnIU=; b=scwFy54g47yCsutjDrI69QTlhI1uxeXXwwMkxu99DGfMecYufviCDZhaJtttsIMC4U IDMzlIn5cc0D4FYIWJ0gtHsFIzmygR7nby6C2R+TLhx5UHYI1HqW3/f/6UoxTq5JxxJN 7MQYf7frCRFoxU4ee2s/l0M/pG/W3i5nQlUcaWdEeTp1QtvY6x/JaNX6VWIQCT0j5dSQ CKZRpt/aP5yAw53b3s36L1qqsG+hViero4DO1jXugFmm57oKxi14sbEPrKsg9ajeKq01 K9IXEaEleJFxzjNUTpiQWXoMzIQf8j7+HpwkQ+oxruUWVtOvEa/QfzTV+kpWU/r5hWVa 4yHA== 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=unKxoBvpAK6IPgLwXYkW/pWj1LpQAgEKY3aucDiWnIU=; b=tffxpwCax4sZBQXxAr0vllQADqTpWUnvWA7nlgk8sV1ArU01z2LlHZaHhXSiltyfjs eWW5CENmKNpHoDVAcMmEgQm4Yp1ljqHmxFyD5MmGRZWdU2dYOVIiaz2OZEAQl03h9UHP fTy9YO6ALZynkKr3H15I8UAWyYnMF3xpPHP0jVQOGmB5kYpyFq8vsJzajVtCBtdoO1iW DtKtXv9oadeugDCzXkTixuGLfqmzLeLvZ7D5+O2XwI00hhLuKgEvceRJEBFH9U/2Ycvc Vvk+s3omVWAKbhm9CZ227KWetMWgHS5KQo6RJi3pj+BRWeVJdrYEGzpW5aUit2ItoW9s b1pg== X-Gm-Message-State: AOAM530Vqtq0RDAWI1tZSMHrRosqCOBKPcJ8PqOaKpc5KYJgFhogRFoV C6AoRMMBWOoMeBWFKxD6XUFPTK9e/VI= X-Received: by 2002:a05:622a:1487:: with SMTP id t7mr11465128qtx.345.1618841488361; Mon, 19 Apr 2021 07:11:28 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:19 -0300 Message-Id: <20210419141024.8174-23-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 22/87] avcodec: Remove deprecated avcodec_get_context_defaults3 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: 9p1ZnZBhE0hH From: Andreas Rheinhardt Deprecated in 04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 9 --------- libavcodec/options.c | 7 ------- libavcodec/version.h | 3 --- 3 files changed, 19 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a3c8c425cb..cbc1556e0e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2545,15 +2545,6 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec); */ void avcodec_free_context(AVCodecContext **avctx); -#if FF_API_GET_CONTEXT_DEFAULTS -/** - * @deprecated This function should not be used, as closing and opening a codec - * context multiple time is not supported. A new codec context should be - * allocated for each new use. - */ -int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec); -#endif - /** * Get the AVClass for AVCodecContext. It can be used in combination with * AV_OPT_SEARCH_FAKE_OBJ for examining options. diff --git a/libavcodec/options.c b/libavcodec/options.c index b8d4a9faf6..833072b192 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -160,13 +160,6 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec) return 0; } -#if FF_API_GET_CONTEXT_DEFAULTS -int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) -{ - return init_context_defaults(s, codec); -} -#endif - AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) { AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext)); diff --git a/libavcodec/version.h b/libavcodec/version.h index af737afce1..0ce49e6892 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -66,9 +66,6 @@ #ifndef FF_API_COPY_CONTEXT #define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_GET_CONTEXT_DEFAULTS -#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_NVENC_OLD_NAME #define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif