From patchwork Sat Feb 4 10:42:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40257 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1869479pzk; Sat, 4 Feb 2023 02:45:46 -0800 (PST) X-Google-Smtp-Source: AK7set+JmqAypn2eh2KTPbTuKqUrlG4nH7lZi5jvkoPrHct5qpPtR7eKDfnJdgMZVI7s009Br9sD X-Received: by 2002:aa7:da0f:0:b0:463:e2cd:a8b5 with SMTP id r15-20020aa7da0f000000b00463e2cda8b5mr12776034eds.11.1675507546000; Sat, 04 Feb 2023 02:45:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507545; cv=none; d=google.com; s=arc-20160816; b=WONtsE3xVMac61RQjilZZt6cMBAsz2J61dv4IlsMy0qthX56/afWJnnFpGpfC9vWMK 7Cx72AXINW/c6xYpL9F7+uolkbssCLKax9wZTfKJmzanqhJUd2/M92x/5voTwAGaYjPo xN8V9t1oCvAO4NOD6lMP7y7111O5QDb7GkxQ/QnGxXDlOgyXIr7FGd/XBivNUPu8w53q VPQS1BEK5AolM9VQTwlJQCSUbJ8VqoBia5aa4D6bqLCLDVhllHD0VXd8Oh0l4dfo1dEk f8D5Bvb4CeNI9x3Bx4diefboE2xdhUe5zvbaf/yovPaOK2Np3hqNN+h5L9TkwW/wCM0m /Big== 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:delivered-to; bh=5yI+Ss5d10kIoy3vaOuqSu/u3P7OMjaVDOIUrcL/5Fk=; b=bnYZ8RVx5F7hRytxi0OlVu2aZJWJ/ttK5JlxkywXDWagtRiwJHVqyUff/4g5GaI2LS ny7N0OmpJBZE3jomMrYwMP8lch+hKi0eRJ7MRiqIMB+ryx+MavmFjf+wzKDLDTZ99Vaa DVi5ao5X82J2InBaBjpVFrny1fb+VxIZW7fsekAxo4YVLEN6ziSSRxZIJGq2rgh50oWm eaQh0B/tE34ElVZnGxxyScobuIz9A1QGY+4zYMEqPdsCi2XfsWqS4aNhiY6PfRkngp0j cxm2eydKVE/ppst/cwv0UcdGsiAcmwml5PtTIIlAlFdZOOZJ1qx6ixBK2zU72LSlJeRz svoQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fj5-20020a0564022b8500b0049e34ecef4asi5728791edb.5.2023.02.04.02.45.45; Sat, 04 Feb 2023 02:45:45 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6EA6768BEFA; Sat, 4 Feb 2023 12:44:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E4F768BE90 for ; Sat, 4 Feb 2023 12:44:15 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 39C91240591 for ; Sat, 4 Feb 2023 11:44:15 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id TwCrVJpgTpHy for ; Sat, 4 Feb 2023 11:44:14 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 13901240D03 for ; Sat, 4 Feb 2023 11:44:07 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 796843A06D3 for ; Sat, 4 Feb 2023 11:44:06 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:42:01 +0100 Message-Id: <20230204104204.20721-31-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 30/33] avutil/version: postpone the remaining API deprecations 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: fsdLcdbcLFFw From: James Almer They are too recent. Signed-off-by: James Almer --- fftools/ffprobe.c | 2 +- libavutil/version.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 5beaece094f..db37ec52f49 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2588,7 +2588,7 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, print_time("pkt_dts_time", frame->pkt_dts, &stream->time_base); print_ts ("best_effort_timestamp", frame->best_effort_timestamp); print_time("best_effort_timestamp_time", frame->best_effort_timestamp, &stream->time_base); -#if LIBAVUTIL_VERSION_MAJOR < 58 +#if LIBAVUTIL_VERSION_MAJOR < 59 AV_NOWARN_DEPRECATED( print_duration_ts ("pkt_duration", frame->pkt_duration); print_duration_time("pkt_duration_time", frame->pkt_duration, &stream->time_base); diff --git a/libavutil/version.h b/libavutil/version.h index 3bad472227a..24b9980601d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,12 +105,12 @@ * @{ */ -#define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 58) -#define FF_API_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 58) -#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 58) -#define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 58) -#define FF_API_AV_FOPEN_UTF8 (LIBAVUTIL_VERSION_MAJOR < 58) -#define FF_API_PKT_DURATION (LIBAVUTIL_VERSION_MAJOR < 58) +#define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_AV_FOPEN_UTF8 (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_PKT_DURATION (LIBAVUTIL_VERSION_MAJOR < 59) /** * @}