From patchwork Mon Mar 4 18:06:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d808:b0:19e:cdac:8cce with SMTP id iv8csp159067pzb; Mon, 4 Mar 2024 10:07:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU5s55wHi6VexesX6AxmstxRxS6Gmq7PIiLPoXwRUmMLohfmZydOntZiZGmirMz/AmxYAP22J6a1nvQsLv7w8wqtoWsz2mVE4DZnw== X-Google-Smtp-Source: AGHT+IH0kaFpufmkFW70//MlXHKYCRTN2bCIneKrQvnoPzCplwzT42gc+yMlAiJyzok8ANhyfwx3 X-Received: by 2002:a05:651c:1a23:b0:2d3:cd02:6c55 with SMTP id by35-20020a05651c1a2300b002d3cd026c55mr2073187ljb.2.1709575642454; Mon, 04 Mar 2024 10:07:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709575642; cv=none; d=google.com; s=arc-20160816; b=odbyIXIN2xKxY5o7EkRbEPvFVt1zVb4Hiv/Q0ewO7RIPHr0tglOFiDrljtlvnr6MjI c6j2zDXt8PWYVJgnME7CZF8wD4L1/9KnVaU3usMNUW0tsjAy6IGbc4NCqtQeu1pCOeiV swUoZGRMjYDeL0GjEe3RCygJPGWcDhcDGPXi6khWjjDkGHkd5OwMOhpI7hHJCH1ttJUO EhLcWWZTKo2d2w5Hm1C3inEjKey0SvsuMUuFbb2H2RYJwZ3Y6GWci84FBWykxpEWRJYu Sj0IsxdtAj5331jz7txQqDM4CYmC2t7Q3BFkcv0MCUq2sDmF3c3J1D1A7OyErj8gWqge bNDQ== 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=IKEcoskaSlLMC1MqT6j5OBAKH+4PEqtr5p8yWVe15Ms=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=KzYaAa2+Kt0Gjfz0bloxSC60JDVNAd9iHBmEKU0ZGmH4OgFMt4EIIJi9ZZzCsoFIlQ yK4ZqzWUKMDq4jwMnbbSMKzo3poAguc+a9WYZOoW52MH+4IWOPXnf1/9MSkIcCnbcBki KE9xe6JOql2T8IWe35UoTOzgXicsxXD7M+NB6BWO3JBluK0YG9syX4Ev8NnBwm1r4Snl M0v77S9tEflaQVviPduOp8iF2afp1coUpk65urjC3MNGRn8tqzFRB1wPsXaXnsZD1MAl 4+2ot20GQfflAb0nTGTHcbgwObU7oVDPTzp9tsov5lkgX/5cBLaCYHiGju/LAEA7cdHV jSNg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=bXnzJz3w; 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 g7-20020a0564021ec700b0056765ae3b7bsi630560edg.93.2024.03.04.10.07.21; Mon, 04 Mar 2024 10:07:22 -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=bXnzJz3w; 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 7CCC568D4A6; Mon, 4 Mar 2024 20:07:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F138E68D368 for ; Mon, 4 Mar 2024 20:07:03 +0200 (EET) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5ca29c131ebso4070091a12.0 for ; Mon, 04 Mar 2024 10:07:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709575622; x=1710180422; 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=vHilSz32bjhCRJDOE2bS64rYFSS73vsPcX3S1MW81/g=; b=bXnzJz3wfoi0Kgg4DSAHFynoPJEskeXYawEeeB9RfSOLSWHDoB/K/q8cEWgezAdwqO pcB1osYyA/J8QMsY8giqIm3ZxEsHHvn7/V3Z0JcAKrm5phGWeV5C68w5yl+AoMGHi6sM 23GeC2bjGueDQ4jXKJuoyKinTnIEUA9OYbNxC4/DuxLp5hoMZRaG8xYn8Xh3LL9pAk4c w0E56ng920bBaHzg9OWSq12fgODufW9rH9enpgQ9Xr2FaYLNp6Pfn66N6w5CQ8bGxSX/ Umg1TEc23YYmVHOrS0POvQpn2SazHg8C6/OvQZq72vPhDdCWX2kIgfk3gfgHorz3R1fd v3BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709575622; x=1710180422; 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=vHilSz32bjhCRJDOE2bS64rYFSS73vsPcX3S1MW81/g=; b=tWtqnUF9VmOjChH2Y+jeeO3rNTPiblrFVC/uDBjw0Th16Q9tD0dhaW/lVnivsV4Bqd 88+H6PZ/thdxBsA+vCJMrTVIeAi5C0YUols7EHMfkZ4o90N/EyrRPZTFonBqkuMcwREO uFncFjgwCVNrwJq2r8Em6xbfeAKMmIVDWzmDAz5URSy+TNfIi6F2R514IJfBN6DRLj// Uh/5XmiEkeW2kQA0GKojxdh45SlO3fXdxYGLVbryM0H6OfoLwUIixtefBSVKthkcnTk2 S2/qkeBoiLCR54cgHjPxB0ziCfIlHCeOtMn9MiNdFI1qHJPXuAMCDzOWbtZSpSMi0gsc mlwg== X-Gm-Message-State: AOJu0YxpmoM2WCB3HnHP1a28+kft2f7UL96ME/PaIJ//p/zJbxh7oOvW /15hRqLAaJPNTtx08/i1mqaag48PHMY4ACtsu/qZKHu6qItm6yieuuBhl855 X-Received: by 2002:a17:90a:9b84:b0:299:6c50:c2a0 with SMTP id g4-20020a17090a9b8400b002996c50c2a0mr8487638pjp.23.1709575621781; Mon, 04 Mar 2024 10:07:01 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id gx15-20020a17090b124f00b00298ca46547fsm8089145pjb.36.2024.03.04.10.07.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 10:07:01 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 15:06:11 -0300 Message-ID: <20240304180613.7280-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.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 1/2] avformat/avformat: remove AVFormatContext.ts_id 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: iO+36NHKfHqQ It's been replaced by a demuxer exported private option. Signed-off-by: James Almer --- libavformat/avformat.h | 6 ------ libavformat/mpegts.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1ae4c37d45..d74db17df1 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1591,12 +1591,6 @@ typedef struct AVFormatContext { #define AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE 1 ///< Shift timestamps so they are non negative #define AVFMT_AVOID_NEG_TS_MAKE_ZERO 2 ///< Shift timestamps so that they start at 0 - /** - * Transport stream id. - * This will be moved into demuxer private options. Thus no API/ABI compatibility - */ - int ts_id; - /** * Audio preload in microseconds. * Note, not all formats support this and unpredictable things may happen if it is used when not supported. diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d4fe03bb67..de7a3c8b45 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2561,7 +2561,7 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (skip_identical(h, tssf)) return; - ts->stream->ts_id = ts->id = h->id; + ts->id = h->id; for (;;) { sid = get16(&p, p_end);