From patchwork Thu Feb 25 16:27:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25989 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 551AD4492D9 for ; Thu, 25 Feb 2021 18:27:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 345B6689A63; Thu, 25 Feb 2021 18:27:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 187096804DA for ; Thu, 25 Feb 2021 18:27:34 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id i9so4830991wml.0 for ; Thu, 25 Feb 2021 08:27:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iuS1z5VSdA2b5mfMuqXNMxQZMbofj5H2TmF9n1K9G6I=; b=iK49R9CMkjiv+DC4WFNoLUT2J8iea70ZG5oPIIJ23iNq8bkxrWUkeet6xThcQ4fkAl 347YtZbTOGwhAhqp2tLa7wzZyecnuocMLF1zlt9WlDnEV/61EfbKqgQRhjoPXWSX3+fx 7hG9og0KaeFbWpsOhAX7CPZYHFEjuYVIdXLmVuRBy0APB8v9NjwavYBGV+inYFptFal6 KcGsLluAoIMppqRF/JSr1MVfY2t3nPc/wbK7J4vMl4ZurGy6L1C9L2mivV35tPFBd1ff Cme7o3E7SQYle1L1iXRzh79aa+QWzr4jnyhKehAnH+KISg6X83X537bj15fwV9IeaG4x MB3Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=iuS1z5VSdA2b5mfMuqXNMxQZMbofj5H2TmF9n1K9G6I=; b=KlxQGMGgbyovYMrkWLvxM+AJq0umdiahYSTuW7pv4IKkknmxinrj1w8q5t/CDzDvSn vUAOmxQpNsaiHzPC+ubz3hE2m2n6OIuhTmz+RrCTc+SN+FwnAcs9sKRZtuMhOxRqd4Ga uNvC2tn99U7yt1eqBk34JZU/ODXkGqfVjvyhZPntsad22B8krnc6xx7GvlnVE7fFb5xv gCTgvSyNMKloJIe2rRJO4K3YbP0LDv8+4HCFHLr7MWJDSX1qkAx0QtMdU3dh3NtJkUG7 cJi2Ek4PKBpqXRavkGtynqhDp2APtcO35Bfg7Ex1mZEDPm5f9GvUIL3Q7emgn5urBcv5 /Cug== X-Gm-Message-State: AOAM532lEYyEQtlXpzFJRLufmL50d6ACez7282uhB5LTG0tzb4iT4wbw MwT4mlerzpVxvydGxe40BUeB6XgSpwQ= X-Google-Smtp-Source: ABdhPJzcXFPFb9LwptlH2jPYlHw9edwYWsE6sd0HCueaR612otHJ7wQ58OahcbiQUYkhA6JVxJGmGA== X-Received: by 2002:a7b:cd0d:: with SMTP id f13mr4066448wmj.74.1614270453313; Thu, 25 Feb 2021 08:27:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id c3sm9909031wrw.80.2021.02.25.08.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 08:27:31 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Feb 2021 17:27:22 +0100 Message-Id: <20210225162722.1368854-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <63739667-8ca0-db10-45b5-b92c4d0c0514@gmail.com> References: <63739667-8ca0-db10-45b5-b92c4d0c0514@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] avcodec/avcodec: Add missing deprecation to AVCodecParser.next 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The whole old next API has been deprecated in commit 7e8eba2d8755962d9dca5eade57bf8f591a73c0c, yet deprecating the next pointer has been forgotten (the next pointers of other structures are below the public API delimiter, but such a delimiter doesn't exist for AVCodecParser). Signed-off-by: Andreas Rheinhardt --- Thanks for the hint. I don't know how I could have overlooked that. libavcodec/avcodec.h | 3 +++ libavcodec/parsers.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5df6a8aedc..b0cb91f555 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3512,7 +3512,10 @@ typedef struct AVCodecParser { const uint8_t *buf, int buf_size); void (*parser_close)(AVCodecParserContext *s); int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size); +#if FF_API_NEXT +attribute_deprecated struct AVCodecParser *next; +#endif } AVCodecParser; /** diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index f8cfa1cde9..3d944f5222 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -79,6 +79,7 @@ extern AVCodecParser ff_xma_parser; #include "libavcodec/parser_list.c" #if FF_API_NEXT +FF_DISABLE_DEPRECATION_WARNINGS static AVOnce av_parser_next_init = AV_ONCE_INIT; static void av_parser_init_next(void) @@ -106,6 +107,7 @@ void av_register_codec_parser(AVCodecParser *parser) { ff_thread_once(&av_parser_next_init, av_parser_init_next); } +FF_ENABLE_DEPRECATION_WARNINGS #endif const AVCodecParser *av_parser_iterate(void **opaque)