From patchwork Thu Jan 25 13:43:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45817 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8888:b0:199:de12:6fa6 with SMTP id d8csp81179pzf; Thu, 25 Jan 2024 05:45:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVYB/f9GlnXAAG8wBjenH996pvEFI25lu7dVnJ/3/auM6SoZUDuWHviz8PMEk9zH40GfnZ X-Received: by 2002:a05:600c:a46:b0:40e:872a:fc07 with SMTP id c6-20020a05600c0a4600b0040e872afc07mr299523wmq.111.1706190357196; Thu, 25 Jan 2024 05:45:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706190357; cv=none; d=google.com; s=arc-20160816; b=1JxhUp2HronENkqjXEUdMAfRUDXmfYDcZep36DMDgsU7mtgffNf0rTeQ5j8bdSSobG LiiR9c16yDXYaGvl/iAs/Sh3M1BF1+VgUArpLg06A9XsQP0ZckWQYA7CmvMj6sNVbZ9z ElhcGMK9rQMLqgYFA9QntGPNWpeiaEMFHPcKBw0NXq3cg4f7od7Yw20KmvYRByOyX/bd RImC5to7EuD4Cj//QkM+2qfGAT1PhAs1weXUyNUEg9oQYiI7QlnZrjndA8nSORsqVOQl 8k99g6rFIPV9oHMhalgSFPQYnSFZaBjGDgAWk43YDE6fm2RVsQ5i0Lulce6RKj2qdPid jtug== 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:dkim-signature:delivered-to; bh=hceQgyPsecQBleFs6QV1GUVQKs3GUcQbhqdsBc/ZhEU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WkMS088tTzBHwy8ix3LGAMdzHYx/Gqrq6YVKapULCVzD7ug7yQHk0vmseg4j1QroD0 V35UQgJLEmdAuRrsDQnFfc9rreI7sZ4NzhTjAsz/b1Xic/0lftuuYrABA6iERsaNJl/x fJPQ69E5QbIvXH0fceLFS8AaVNRNwlwY7J3Y6KlF5ACGMX/Nylj4be9/nCAzn/oLh994 nXXlfe0wx5Sl3cJBMHzGx8wfefdC9hAuHnUomPwScNge5mlFO7FaMrJMdo5SPQWF30ci Xj4gZllfAJiZ5yqK1kcL/JGrOCYhgqLD2F62Z8lPjGevSDKImspGN4qOOp4HuJXWExpF XrEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ElZV8J4X; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id en14-20020a056402528e00b0055ca5ce7abdsi2147176edb.617.2024.01.25.05.45.56; Thu, 25 Jan 2024 05:45:57 -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=@gmail.com header.s=20230601 header.b=ElZV8J4X; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 31BF068D14F; Thu, 25 Jan 2024 15:44:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74EFC68D111 for ; Thu, 25 Jan 2024 15:44:45 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d74678df08so28139905ad.1 for ; Thu, 25 Jan 2024 05:44:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706190283; x=1706795083; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=n+fSgy2vQ9OPe+Ze/0PI8TovdCJ3+uzrVFXwT0F3wbk=; b=ElZV8J4XRUbdEMektvOcaklkDuhm0iiF+Lm6YjW9Glj4oplSEvYaICYSokvsjTREMC a9OcuoEPF8usyJd3wy9AgFoGpnMGfZf2orSE6BtbIdLKdsfTPJVpvVDwweSykvELR+1l AxWoH9UaFAQkakhtYUX5aQzbVMfoJ5ZRF8Yz+V90nu9V8iUC4UhctikDiD9J57eDfmhB 2RlVsZa72DAE/FNNInimG1qxv+0QZcJOtyOJiOmbg+O9pTjb0qSGuVNevPAusS+aM/gI IHtqGj/g69RCjrivBjDqiRAc5OFYlrhshpDaohg4N9F4FxcvJt0O7b3V25Q4TFrDsLBM iX8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706190283; x=1706795083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n+fSgy2vQ9OPe+Ze/0PI8TovdCJ3+uzrVFXwT0F3wbk=; b=SGQ2aPwSlVig8QZbyP5fcAxEaWDSeba/p+slbvS6Tlg5O3eUlVv7q1QtxtIHSZ9MyJ 9S3GsvhFp52L1Fr3Wysnzx4yxaqkBbl2mLJnjeOjhYGuNPX93HrTW59UHVBwT+eLbflk a0Ifluw1rtTdLBlps8XLqsxigAciqXxCKadxuQvwj320b5Zj3fsIGIbmDtQz43/6gqtJ 5woE1OmlynZN+r0DSXs6/pGKtQtjqRBGd4hQmJZInskRaJMaJ3fsm6lk6mwvUiS5oqF7 X5IjF+hFRM3dK8aeVUz0GcBRKY3oLllXOfHFpJychLnqfYbE57NIxOeenmU1u1GBLSaI 7ziQ== X-Gm-Message-State: AOJu0YyN/dZqzSx51LwPnqxv5xRbQJuN4mx8jpTYEOlS8r+qa22lzFMm 2AKfFjAnNnES7zMD9DHPr92aG+lzimv2W+6OHHl372irlGRZxWgdyNMojm/6 X-Received: by 2002:a17:902:fc8d:b0:1d7:365c:8926 with SMTP id mf13-20020a170902fc8d00b001d7365c8926mr935687plb.87.1706190282657; Thu, 25 Jan 2024 05:44:42 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k17-20020a170902f29100b001d707a14316sm11785146plc.75.2024.01.25.05.44.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 05:44:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 10:43:32 -0300 Message-ID: <20240125134425.374-10-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/24] avformat: remove deprecated FF_API_GET_END_PTS 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: nbLpXuZcS89s Signed-off-by: James Almer --- libavformat/avformat.h | 10 ---------- libavformat/mux_utils.c | 10 ---------- libavformat/version_major.h | 1 - 3 files changed, 21 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 5d0fe82250..446ca9e6bf 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1097,16 +1097,6 @@ typedef struct AVStreamGroup { struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); -#if FF_API_GET_END_PTS -/** - * Returns the pts of the last muxed packet + its duration - * - * the retuned value is undefined when used with a demuxer. - */ -attribute_deprecated -int64_t av_stream_get_end_pts(const AVStream *st); -#endif - #define AV_PROGRAM_RUNNING 1 /** diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index 3e63b8039a..9d811c14e2 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -30,16 +30,6 @@ #include "internal.h" #include "mux.h" -#if FF_API_GET_END_PTS -int64_t av_stream_get_end_pts(const AVStream *st) -{ - if (cffstream(st)->priv_pts) { - return cffstream(st)->priv_pts->val; - } else - return AV_NOPTS_VALUE; -} -#endif - int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, int std_compliance) { diff --git a/libavformat/version_major.h b/libavformat/version_major.h index 224fdacf23..4dfb26cca3 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -42,7 +42,6 @@ * */ #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 61) -#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVFORMAT_IO_CLOSE (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61)