From patchwork Mon Jan 15 12:11:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 7290 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp2841705jaa; Mon, 15 Jan 2018 04:18:05 -0800 (PST) X-Google-Smtp-Source: ACJfBouJwB5Cq98PWPwK5PgG+AUnjJXRVGnXv6HsD98EagzYuczauymzcdRB401acC/PPNr/6Gc6 X-Received: by 10.28.118.15 with SMTP id r15mr8167650wmc.88.1516018685447; Mon, 15 Jan 2018 04:18:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516018685; cv=none; d=google.com; s=arc-20160816; b=G2Y+6UCvfOXpCQ5RFAgLbkUTz5cATsjO02s2Fn9a661kLqIkFsUTwjzXmvIzPtOPwk rJMweuuLeL2yBLMu8klTZYzqKZN9slYXNd6QLcGPuNhDz6ComPvHUImlF5w1S6h1KU1R br7C4RpS5V8xayBhrWbgeTAh4aRaKxHvaXiZlbGSH1Wq3+tjXV8cXrM97vU/TY7xLHz0 aII+BxcTH12tX/PDt6P8RFelJ0djYGUByaFgZW2QLJ13khO+3U0yjuByZYEYIjHdzn5W 9gNg6FGd/oieCX9vm6TUnMj9NzrdzIqWdy+hGFf42YJvE8lLp+lIpmwnate/CZgaNjGS LLnA== 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:cc: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=hjHxwDet7xAIHcK0/S+yqcJhvEkgn/0ghQ2w2Ivyrug=; b=t7yRn8QTli/FVllxGUAOULP4e7h+y+0JZYInsgVo+9TxpcJuLRo0mj48hjFffU0q9n 2I75hEGBT5FdmtZizzZZNYH/+4LgMrvIZ3MspPF4Nr21vw+k6s7ax0X8CLvVVAy5nRu1 JVx8nMIUs6KRMirSI23xlfz8JHZ6eU/T9ufLNktMFAMNZKQvs83rwJgAVtGba5f3yJNd EgEy3Ptiag4fEwKJWCtvQbAHD3G19JRP2RV1QUwu5qTTfYW14elF1Ddb5u8UYpJinqO/ OJOOivtrzfHNXntPKm8kTfD2OF9aABZr1IJ7HocUMhBBQ3cYqDGz7Fnm1Z9Zwn2nkr8t Lk9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=m5QpsuWl; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p7si6638446wmh.105.2018.01.15.04.18.04; Mon, 15 Jan 2018 04:18:05 -0800 (PST) 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=@googlemail.com header.s=20161025 header.b=m5QpsuWl; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DFFD9689EC0; Mon, 15 Jan 2018 14:18:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CB30689A92 for ; Mon, 15 Jan 2018 14:17:55 +0200 (EET) Received: by mail-lf0-f53.google.com with SMTP id f3so13119652lfe.4 for ; Mon, 15 Jan 2018 04:17:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0H1Hu6CH6httU9HCsB12EOE8HarOp8q7PcBesM7ssrs=; b=m5QpsuWlhFrsoG1qbDy5gzh6YyYArBEzgkz39TITGvuks3Rdxzp8IXVeQjIcxuWURW CrxezvIz9b3m6c32Wvr+8J2SL9LG/yRR4Art5A1KCXeBz1dEs4TaHoiQkSujlwbmfcK5 VZW0fAbPkGMeb8I1YxOrhzYkHGtc1sdrigCu0e3+z0OnWO1nb8PR1E4wIDn03hkpbgPY UIluiw4leWwsT70mNJhfhE2+I7dEdAC4LrssUvXvJIO/ZP0rifK9SMWXGf4cR003PkK8 iJ47tXwL+ZqUNQ2pJYBCxP7UmsZRUgcATTZLmsZaNcimNhOg0OseTgBo+VPkA08yks8v t8uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0H1Hu6CH6httU9HCsB12EOE8HarOp8q7PcBesM7ssrs=; b=S1FJT0GUsdXWvaLjLscE4uktr9Z1MM8oboJgN1HV+1sVe56Yd9LcuPy5JXFvd6+/K/ PEY1Oee1yL6FACBYkMFjO5pP47yXfj1X/84xEdM+54nX8AJurXqbKy01j+WogJiy+sj9 T9auNTBUPS8XBB1ngkaamBM5cZO3+Rb1FuqYKG4VcKjpMJeBPWoZSMLc8bqA7fTB/iUm BEdtAkuxzte7fIHOlhnJj05UVDRkXMw0oVsDBiG2L/EhWSAhq0NHQ37U/L0fyCN+O9Ss uJku88dFmvRtLb9SFDyOc2oEJZ0aN+dLP82WdoxyZ/b/F3pGBdnn9S60jwOLeTG7pX0P S2pw== X-Gm-Message-State: AKwxyteiL6bRJNFGILnWd2g0Cz2nCIjT6ZNZvvJcxpH7X0XkIgBswNEr cqhqxsW0nUInCZ3AHHZGGYGtcQ== X-Received: by 10.25.23.81 with SMTP id n78mr5488951lfi.130.1516018273781; Mon, 15 Jan 2018 04:11:13 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC152090E2A8DCD919CC.dip0.t-ipconnect.de. [2003:6c:cd4e:dc15:2090:e2a8:dcd9:19cc]) by smtp.googlemail.com with ESMTPSA id h62sm778390lfh.3.2018.01.15.04.11.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 04:11:12 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jan 2018 13:11:19 +0100 Message-Id: <20180115121119.11061-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH] avformat: deprecate another ffserver API leftover 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 Cc: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- doc/APIchanges | 4 ++++ libavformat/avformat.h | 2 ++ libavformat/utils.c | 8 ++++++++ libavformat/version.h | 5 ++++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index d66c842521..0184815224 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-01-xx - xxxxxxx - lavf 58.4.100 - avformat.h + Deprecate AVStream.recommended_encoder_configuration. It was useful only for + FFserver, which has been removed. + 2018-01-xx - xxxxxxx - lavfi 7.11.101 - avfilter.h Deprecate avfilter_link_get_channels(). Use av_buffersink_get_channels(). diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4f2798a871..6f4b58b14b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -986,12 +986,14 @@ 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 '='. */ char *recommended_encoder_configuration; +#endif /** * Codec parameters associated with this stream. Allocated and freed by diff --git a/libavformat/utils.c b/libavformat/utils.c index 2185a6f05b..1101c50de2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4256,6 +4256,8 @@ 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; @@ -4263,6 +4265,8 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src) if (!dst->recommended_encoder_configuration) return AVERROR(ENOMEM); } +FF_ENABLE_DEPRECATION_WARNINGS +#endif return 0; } @@ -4310,7 +4314,11 @@ FF_ENABLE_DEPRECATION_WARNINGS if (st->info) av_freep(&st->info->duration_error); av_freep(&st->info); +#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 5ced041f0a..d566e255e5 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 3 +#define LIBAVFORMAT_VERSION_MINOR 4 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -82,6 +82,9 @@ #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_R_FRAME_RATE