From patchwork Mon Apr 19 14:09:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp558571iob; Mon, 19 Apr 2021 07:15:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8OyPg6dBcV1PJqcinDe5H0/ccfl+3teEpyCVqBjeNfCGLc3g34jFm/BDtSMOMdzXFBIBM X-Received: by 2002:a17:906:49c1:: with SMTP id w1mr22749787ejv.178.1618841701269; Mon, 19 Apr 2021 07:15:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841701; cv=none; d=google.com; s=arc-20160816; b=rXZ240AiDiWXj1lofo7Xqs1zDQ3IUOd7wG9EcKy2Fyj1xVmTSUQv2oICpXNp0966S2 N8QwOlLumKf6uh54uQeGEP2vl+n69F/0tKaLbq6uYBJYPiH9a/WYVpp/7jju2xWnOI3q MBCkkzd23VhemfwlOhhCU916eNxB7cslpK5VlGPMQLpbG+ff2jZyDO8cXpzjxU9sriVT XHzdmT7Yj0kjIEdz/8KqE7q7nIbNNyDv4bUnEb2l1feRjYgaD/zT1UBhlMVUjS2ttDy2 C7DsfjLF6sQwoseHyxp0IMup8ACQK0/BmyJ+RmIjdu2+GmhdRMgfysr80UbAikp3zp5R QpDA== 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=bi+PbtLUR6vPdOgEI2oBd1ja/VipKGo2UZeACj6nwMw=; b=BDav/na7oGhluq9dMFi2eLuB5eRzLpO8Bjju4ScI+vHjtgHRZRlV6sWyRoccqM8lH6 Kc8hSsrtqtYPe9x/oLsawxOYMXDXHmsh94wkWqoC91aQZfvv/EgdWCg/S5hXakhgmLPf rmWIQuS+3/eR2IdEE9kBHiBOOSX8U7pqJ7TXv2sCAlNi1FKvCBqY1PPWq2GkaFNrh7SK h/z/+Az+rbJHSJIFlpktaPqep1FifbBiaEmb/fdlFRGcWh+Z2Hug1xQaV9Yg4x5d9QEr l1u3P1ORFh/lEenXjyVM5g5H82UJJTa/15zkcQLPo/trrdhAnxsgwrXmdej54eOxglsG AIEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Kxz8BsNe; 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 bc2si4684401edb.287.2021.04.19.07.15.00; Mon, 19 Apr 2021 07:15:01 -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=Kxz8BsNe; 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 A16A368811D; Mon, 19 Apr 2021 17:11:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D18AA687F99 for ; Mon, 19 Apr 2021 17:11:43 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id x11so35788067qkp.11 for ; Mon, 19 Apr 2021 07:11:43 -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=ld+e+bHjaejy6Y9ij7RZK9Z02zll44/FS7n8chE8viI=; b=Kxz8BsNeYCr8XvvsekYYhgPhTaTFvRwdOpXp+Cz+E11p+HcOCgO4aQd4F7WcySafxn W1/yMh7V6/f2Pbl+mBxRvWMWc1xuPQhQHmgfp021UTLaSPcTVfOVu/2uuQUE8O+UDPw1 XRPnQgRvgczPLC4in7ZK7sBfXLMB2CmrVqlt2xgda5QRjS0radrbu0IIXEksOovmyVHM dRViTa2Fxe/YJnl1kxaQ/dO7tv+2ddQ9+mxev3BPz51ysFxwPYdI8VPE3KTqvvcEOvn6 lxOLNpNz83rTCzlFjo02yQCh38OJ+AZQe8ehNyza61TuBuTU7JDIFB4X4MaSiCAT76iS 84dg== 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=ld+e+bHjaejy6Y9ij7RZK9Z02zll44/FS7n8chE8viI=; b=RSjaNQt7jHLNddszSTsQCs9QSWeLGk9V8QMDnuxnKXnPnrAIL2HLdULHVsrDv/3q6X I20BuG8pT6YUgSaB30lZbJpKTo+Cj9c/eptOMJgpbz/35ekzYiKfNi/Sk/q2p2C5rvJs Pm2zWqoCBBUxkPkwsd0aLTKcISAJtmFFqpdI/9vmtZrEriv0ImZ7HpRTIhFLm71moGEq /45xDquwMvsHioXrsLuXShmKMwyPWFKkGrZPaPRwicSlBHMOMR29gya5g2QuoB0F0owZ rEXzAkIo9X9gcNAbWDC9EuH72Pkbdgq5k30fAz2GbRC2R8ed6KQXz+4pNDeZ0S3qa6mj dq5Q== X-Gm-Message-State: AOAM531UQVI7rGZoVEhxQHKSPnaO6jG/bfnxGDF4e+/LYxQPGgelIbjK SNg1Ttkbjdh3jL0OdPbJV1fS+chrAWU= X-Received: by 2002:ae9:ec03:: with SMTP id h3mr12667913qkg.87.1618841502513; Mon, 19 Apr 2021 07:11:42 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:31 -0300 Message-Id: <20210419141024.8174-35-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 34/87] avformat: Remove FFserver leftovers 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: T3Lww5DXhxOj From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 18 ------------------ libavformat/utils.c | 22 ---------------------- libavformat/version.h | 3 --- 3 files changed, 43 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 166f1aa41c..578ccbd87d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1000,18 +1000,6 @@ typedef struct AVStream { */ AVRational r_frame_rate; -#if FF_API_LAVF_FFSERVER - /** - * String containing pairs of key and values describing recommended encoder configuration. - * Pairs are separated by ','. - * Keys are separated from values by '='. - * - * @deprecated unused - */ - attribute_deprecated - char *recommended_encoder_configuration; -#endif - /** * Codec parameters associated with this stream. Allocated and freed by * libavformat in avformat_new_stream() and avformat_free_context() @@ -1107,12 +1095,6 @@ attribute_deprecated AVRational av_stream_get_r_frame_rate(const AVStream *s); attribute_deprecated void av_stream_set_r_frame_rate(AVStream *s, AVRational r); -#if FF_API_LAVF_FFSERVER -attribute_deprecated -char* av_stream_get_recommended_encoder_configuration(const AVStream *s); -attribute_deprecated -void av_stream_set_recommended_encoder_configuration(AVStream *s, char *configuration); -#endif #endif struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); diff --git a/libavformat/utils.c b/libavformat/utils.c index ec48d1c08e..7d944268d3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -115,11 +115,6 @@ static int64_t wrap_timestamp(const AVStream *st, int64_t timestamp) #if FF_API_FORMAT_GET_SET MAKE_ACCESSORS(AVStream, stream, AVRational, r_frame_rate) -#if FF_API_LAVF_FFSERVER -FF_DISABLE_DEPRECATION_WARNINGS -MAKE_ACCESSORS(AVStream, stream, char *, recommended_encoder_configuration) -FF_ENABLE_DEPRECATION_WARNINGS -#endif MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, video_codec) MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, audio_codec) MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, subtitle_codec) @@ -4392,18 +4387,6 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src) } } -#if FF_API_LAVF_FFSERVER -FF_DISABLE_DEPRECATION_WARNINGS - av_freep(&dst->recommended_encoder_configuration); - if (src->recommended_encoder_configuration) { - const char *conf_str = src->recommended_encoder_configuration; - dst->recommended_encoder_configuration = av_strdup(conf_str); - if (!dst->recommended_encoder_configuration) - return AVERROR(ENOMEM); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } @@ -4448,11 +4431,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif av_freep(&st->priv_data); -#if FF_API_LAVF_FFSERVER -FF_DISABLE_DEPRECATION_WARNINGS - av_freep(&st->recommended_encoder_configuration); -FF_ENABLE_DEPRECATION_WARNINGS -#endif av_freep(pst); } diff --git a/libavformat/version.h b/libavformat/version.h index 81326aa199..de18399298 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -82,9 +82,6 @@ #ifndef FF_API_OLD_AVIO_EOF_0 #define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_LAVF_FFSERVER -#define FF_API_LAVF_FFSERVER (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_FORMAT_FILENAME #define FF_API_FORMAT_FILENAME (LIBAVFORMAT_VERSION_MAJOR < 59) #endif