From patchwork Wed Nov 18 16:52:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23707 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 75D9944B913 for ; Wed, 18 Nov 2020 18:53:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 309D168B698; Wed, 18 Nov 2020 18:53:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3964768B650 for ; Wed, 18 Nov 2020 18:53:38 +0200 (EET) Received: by mail-qt1-f194.google.com with SMTP id v11so2053758qtq.12 for ; Wed, 18 Nov 2020 08:53:38 -0800 (PST) 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=epLr6oxZNma5+M6zGWHtVRcGA963cxte5SR4NPnTGx4=; b=filWaetyRN+bzYho96ZSHKYJPv++p3MGjzCvpdidmACTCKW07aA2NSrJSHo5K42ua6 KasEHerWqKmnZjvBUk6+m+azM9NmShW9M+KAzScTNd8ejfYJYbNt6qu2INr068aXKEO5 ftLVYNSYqF+iTtBzXjF6P0DNyOAU6EXzdRd/YPBhLllfMSCXaA+qdITNL9JhPCcsasXV hOReXcGAcYlL5qz/WH+wa3NVg3QxzfYsPpKq9eTgw32X+9oprcVRDKCCKowotFTZZJhh +2y/XVA7m5DstN0L4Z6vIN38prRCCKXauk76HsaoZooXvMA/dM3qTPGQJ9Yj+tjJm8Zp iOSA== 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=epLr6oxZNma5+M6zGWHtVRcGA963cxte5SR4NPnTGx4=; b=EWkgyWh6oRCpodzlQslI822N3h52T57qeM0RfbSfIBACAbffCPFQ02EGTm3yl4GvYo Pkc7ODgM8s52eA7TiRqjARlEfJu336TomnSzY4UDTb8qp5N+i5Q4Az/OPi1BZeJPKkju vZnDQAwYab0RFtS2v286KUqDTirFhF96kLwj3K6WfF3vvDMEhya1BIjGoYhpcXH33Ykb peow6R1YONkSR5XK+PM0/9cXjo51Tl81KZarugUGW3cxPKNsKucx9ZkzM6xOqQAvFEed sd+HlnahKy+N9ndwsa3EspgO0CCpoxf9oxx7WCf4gOX5BNNaGW/YuDU3x1caW2mGeWgB IyCw== X-Gm-Message-State: AOAM533oz5PvsT0yhzv3bjqmWMNaePc3dEWYGNnVlmX/PhKOa8amlmAQ yzk2QOMYMiwoGrRueFgS+hoZMIchNvYRyA== X-Google-Smtp-Source: ABdhPJwiZeXRdSD1Pavep94UoPMFRRwbObC4lZWtKBrxEqtu73XBk92VikxEePMrewxkDVIOShuoUQ== X-Received: by 2002:ac8:5553:: with SMTP id o19mr5430449qtr.32.1605718416575; Wed, 18 Nov 2020 08:53:36 -0800 (PST) Received: from localhost.localdomain ([181.23.91.217]) by smtp.gmail.com with ESMTPSA id f14sm4863788qkk.89.2020.11.18.08.53.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 08:53:35 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:52:46 -0300 Message-Id: <20201118165247.4130-18-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201118165247.4130-1-jamrial@gmail.com> References: <20201118165247.4130-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/18] avcodec/avpacket: schedule the removal of avpriv_packet_list_* 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- Maybe we can remove this right away? It's not in any release. libavcodec/avpacket.c | 2 ++ libavcodec/packet_internal.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index c79200b63b..0db47c1d62 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -726,6 +726,7 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif } +#if LIBAVCODEC_VERSION_MAJOR < 59 int avpriv_packet_list_put(PacketListEntry **packet_buffer, PacketListEntry **plast_pktl, AVPacket *pkt, @@ -792,6 +793,7 @@ void avpriv_packet_list_free(PacketListEntry **pkt_buf, PacketListEntry **pkt_bu *pkt_buf = NULL; *pkt_buf_end = NULL; } +#endif AVPacketList *av_packet_list_alloc(void) { diff --git a/libavcodec/packet_internal.h b/libavcodec/packet_internal.h index 2774d75a7e..fd9637bc44 100644 --- a/libavcodec/packet_internal.h +++ b/libavcodec/packet_internal.h @@ -38,6 +38,7 @@ struct AVPacketList { PacketListEntry *tail; }; +#if LIBAVCODEC_VERSION_MAJOR < 59 /** * Append an AVPacket to the list. * @@ -78,6 +79,7 @@ int avpriv_packet_list_get(PacketListEntry **head, PacketListEntry **tail, * @param tail List tail element */ void avpriv_packet_list_free(PacketListEntry **head, PacketListEntry **tail); +#endif int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type);