From patchwork Fri Feb 26 13:18:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26011 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 C395144A6E6 for ; Fri, 26 Feb 2021 15:18:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF50268AA8E; Fri, 26 Feb 2021 15:18:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1913968AA83 for ; Fri, 26 Feb 2021 15:18:33 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id jt13so14821267ejb.0 for ; Fri, 26 Feb 2021 05:18:33 -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:reply-to :mime-version:content-transfer-encoding; bh=98pCxjJC3PcDlfnpvOmX2SZ6ybP4Wf4B77SO4SComDw=; b=YsbweaLZRqhwiOEM4gOrNQcS5RcGSdl/O+UumSEUhRfITZtFOWbWZ0fvhWhz/7vCGE YM2+TCDFWxE1Bj77tg8Pbnld6zDHhihYr0RpGqVavRR3emZN42oYOX0iF1Netx0w2tQl oN5zCMMeOVz4DEvZr+AYI8gKxffTuPEL4aL0SlIUEyfGD4TvOceq3FHkoXdqaAUzor+B S3x8Z9u0bZVc1dLNUNSzTD2MUA1bABish9nFTx0NdgTIFiE88bTH9bGZTOAIEGp2ajJN 3RLYys7NuaC57GybViKriJPBdyC3jnpir1drKvaXWfAazpS/eFIjPpZqTu+hbWzzUSYc ohAA== 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:reply-to:mime-version:content-transfer-encoding; bh=98pCxjJC3PcDlfnpvOmX2SZ6ybP4Wf4B77SO4SComDw=; b=VBox8fYEAE+1p1EV0BVjnEN7+aqjnb9olCYAPstic0F0he+umAxyqz662mC4ps8R8u s0imR0OHft19nd/sFAhK9NtATZtm5JE8cqZK0TW0gOnLrYvBDvXj/yXuXibna0OltUQc ELIq5pHTBDEJc1SRF9GKViYHIjclFSQE6lEGkoD94xyazLxG5Y8Orxe7035tTm0OPI0Q 1BRWQ2cosfNNI8ghO6YKSRHImdUPWAY2cUewIzYMThMR+b5M/Tax4+wbnLUh9DdnY8gH 8J0vqefci9Xgfng9CTy+wHY1oEqKD+/gqR/1Y65+AW+f7nADSMMoj21nNX/dW5Q31QzZ 2iqQ== X-Gm-Message-State: AOAM531s4HfV8YFWHzdhYRC0k0YG1DKBGU7I4jhaer2GcWdlZyyWVGep +VcjY9BC1M4cwRwPfFRjir6llygnPHg= X-Google-Smtp-Source: ABdhPJypqbxtGJ7xBYmGGcjcqlU/37Tr46QxdISeEUL/uPHygS/aABJ0JgijY9XJHXNOAoWAhrBWAA== X-Received: by 2002:a17:906:4e57:: with SMTP id g23mr3284965ejw.47.1614345512328; Fri, 26 Feb 2021 05:18:32 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id ca26sm5867480edb.4.2021.02.26.05.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 05:18:32 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Feb 2021 14:18:05 +0100 Message-Id: <20210226131806.1990485-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210226131806.1990485-1-andreas.rheinhardt@gmail.com> References: <20210226131806.1990485-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/parser: Schedule av_parser_change for removal 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" Originally deprecated in 748c2fca7e4d99357c234936aa71212a6282be36, publically deprecated in 9a07c1332cfe092b57b5758f22b686ca58806c60 (merged into FFmpeg in 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9). Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 6 +++++- libavcodec/parser.c | 3 ++- libavcodec/version.h | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3178c163b9..a8741df04b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3576,14 +3576,18 @@ int av_parser_parse2(AVCodecParserContext *s, int64_t pts, int64_t dts, int64_t pos); +#if FF_API_PARSER_CHANGE /** * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed - * @deprecated use AVBitStreamFilter + * @deprecated Use dump_extradata, remove_extra or extract_extradata + * bitstream filters instead. */ +attribute_deprecated int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx, uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size, int keyframe); +#endif void av_parser_close(AVCodecParserContext *s); /** diff --git a/libavcodec/parser.c b/libavcodec/parser.c index a63f532c48..f4bc00da7d 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -186,6 +186,7 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx, return index; } +#if FF_API_PARSER_CHANGE int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx, uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size, int keyframe) @@ -220,7 +221,7 @@ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx, return 0; } - +#endif void av_parser_close(AVCodecParserContext *s) { if (s) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 488def4c23..815df15628 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -150,6 +150,9 @@ #ifndef FF_API_MPV_RC_STRATEGY #define FF_API_MPV_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_PARSER_CHANGE +#define FF_API_PARSER_CHANGE (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #ifndef FF_API_THREAD_SAFE_CALLBACKS #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) #endif