From patchwork Thu Feb 1 08:29:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45951 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp122748pzb; Thu, 1 Feb 2024 00:30:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGMs4FDr7skhpUGRu+oYDesv9bSPhWUrUDYOyNACxHxx3efgjLvBfDnAID4d5sY7ntVcELa X-Received: by 2002:aa7:df0e:0:b0:55f:acb3:f9e2 with SMTP id c14-20020aa7df0e000000b0055facb3f9e2mr1376654edy.0.1706776201722; Thu, 01 Feb 2024 00:30:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706776201; cv=none; d=google.com; s=arc-20160816; b=Uvui+KU2QlpFt15sAIBvoiHpbLC2TwzY2H5U1TeC6x0o1GoFNOFdM6T8/Gvdgwiwy3 uJeO6u400hoi+mSHYSAeTZ15SR31qMg8e6iTit8/lKtG9WeK8Jkx3gyUKZFKk9oP1ZjV iDHxsnYUhTi7XaFtMdzQcGn+L9K3SpdtyDRFfgjBnpFuGAkwVqn+XR2ImxO3Ys2Qy4X1 OjWt8319Ofq1fJ6+Zgvi2L8FC8rzPtIDRDrpVHjLw4JByd7eZnZTEKREceFLdyZoepdY SZJBY32H5KFEgF1wXdZZY2ui2dQxTYPN/tT2LJUPioQhhSnfvDnHLQpO8aybyaTMlD/d 2atw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=jW1OUg0L5ZtLoJGm5Kq23B7LWR8xLFAtGOUYlacb/PA=; fh=2RGNcXVWQT/c+8lnKDPfOhu4NYDVXE4KdLGzEOvmU38=; b=WGbQPqZ3R0ZTVc7/HlZPRkBvfVY7wo58b5dDqyk5WLAPKAthpTN7kXxe4VNZ9JT8WB pHhJXEJVR2xbCpnS6/+t2oBJvH7vMsagERYZSYjdbFczUfVNMygi2zkOXyltzHGMS4l3 aZOy+PrsBVoBtDUwH9EjSQwzVHraktVk2DmF2IrNoQsKZ4hoag/cdogxwOiPR+bGd6YO 6bsbEgmlnrp7KCJNwRR+YUstqem5BDnMXtWiSE6xKwBLgSdOCIgBlyn1WjfjEmHfPyzr fKb7R8zy+eahMJRGcfdekupJrsq3xJiTnXx45blpVVs+OfEKUW6oHoeDOb2aP2ijNnwF xCKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=pI+zjGWc; 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 X-Forwarded-Encrypted: i=0; AJvYcCVQ+gofbZ0xv2z5Vr9Hyf5VuNLN9b5rPoJ8Sb6cMpODmPHsVmME+Aenr9/fzpU0a5+NIBHLWYcUqAhxqQBl9ZlpJSTlOaizCLm+xWR9w5fZi3AtVMUTGOCsun1XBuGa2FAVKUvtx/Q4qgxEALN3v1IXlU8JpR0Q47bSULYH6iaMTdGkm22dCoRE7K7curFd4LC8+SwFcUoUgAU4xyst63irVutJQ0KaglMNlNPKjInESuazkznUEXR5NtF2T3Pkukz4P9VbzF/v8466jmIbOBBkOR9CAyitYx5R1yalBLguojQyejwHzyb8IL9XhlzB1R/+Fw2kBSjtxUeG6z6OAw3hoDGcc5eFoigLesPYqwXyHbIZp7SSp6gvUBIqoo9RzsjUEgKcyc1BXfXhtqOHz7II4ghm48TE322u3le/03IW2T8xyZOrzCeWsaa1a6vJmjLh0mWhKgHgoq4VPaeDNfN4YrlAYvRMtpHEsh3h/4WLJ1y0WCmudSTtEq78ATIN9Jp4AG6sSDK0EpLPC0oT23qqfcx5aNLvg8ibYllmuYr8stZmDi8YEMr3lY7w8IqSpyOsPVHxEHAJUdZv/yVUgXsF0i2KOHhw5zxGK/3FUQ/e6O1WB1aI9vC+kLH9dbm+t7ETvlU1oysDJLypapcKCQfAfZRxhFdmaOh9in4oeML+XMObB70q/udJwe3rjVZET2GCCkpNu0jzvFHhPKHq4Mjjh8/KKeSH+FHxJLg/nCEKWD6pmYtv+Mqt+1Is0QipXKUeOS4SV7MJtDXMGNCqfxx7MEGGiTDLItDWNc6enqPknkM9GX09aOUDzmFWC1/zxYYfclsx7A4gqpUUdU+vfqC9cYTUPyaHRzVUoLCr/26D+6cLUeOk1iqHDAIifukHgHdogxYoF3EIJPiLqCkPpUuOkijFFvo115ZW+bqC6KAmoHefuXIHT5iT1jVaV8PpUuQRD6 iq/jhyZ1XEBIta6RmRiVGWRaU7wvqNGsKA6l8luQ5ffVh2EWrlOCGYRDS64G3GHhH0ZVaEI6UD0QQjp3O2A74KheGexj1Cs7/toUPCXMY57ubo9y4GGGKOWVwGYu5QC7IP8Bou98gxGcR0hBkcZq4ZMNz2wCDklCbH82LA9S0K64CHVFU2aKvcyPuGs4BzOuuNBLg/DgwVpKGpBkil0OqE1D7U+zD//fySvIKza6ecWDv+3aaVwneArhzfVkQerEUPPpsN2SVzuoNl63pIRGSN+m3HSxb8jffpsgVSxkmItVmim0TCAfWUsyX8kKE79sUQVgemwJajGu7H7njnLcwRH3C8Fb7hsP505uWx88qWmpW7TSyQ1+HjMBYLAnqrWImj9UAeAL8+kJanYOII6XpVVIsms922hpNAK3YBpZeHaQqpc24Hwi7/TTcK/d5jQ7KgecIRx3P0NAAWG3xHMFePapRp12+y5CXfdGmwGo7b/4oaTh4tgRvQlKGsqg9mCH8L7nrHi9ltC5+/Vu2OwdXjuml+PJ98eVMZEj7Vovfkg/aJhLMjMD0qPo/yzuxxZcUTRG1zx9bb2/ZfDJOSYI4vROeiqqjKhELayILQOvPHbiQ5/hbUf6Snbe1XsBqzkv40kewlP3QtckSPiAg= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a7-20020aa7d907000000b0055fc766c63esi119862edr.349.2024.02.01.00.30.01; Thu, 01 Feb 2024 00:30:01 -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=@khirnov.net header.s=mail header.b=pI+zjGWc; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7345B68CD11; Thu, 1 Feb 2024 10:29:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F50C6881B1 for ; Thu, 1 Feb 2024 10:29:49 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=pI+zjGWc; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7F2824442 for ; Thu, 1 Feb 2024 09:29:48 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id RTd4HRDXm7eV for ; Thu, 1 Feb 2024 09:29:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706776187; bh=3bcZLZHrUGIvuwNJpZXN5EMndTvV1VF/d6CkIBqcbZc=; h=From:To:Subject:Date:From; b=pI+zjGWcmErFVHUessx7U/ttOaFSTJOV9nmYN9U57tPJv0Utf9mA5FPVExOUma4BJ cTIKyv2snFJfsfIKr1NjkGEAJuaMB21tcD2m8xCW+d0Xs+/xMTyhTOop/k3JMVSVaJ x9FIScBsqMD98SnUZXRVSVDU7J/onEmg11umvRjwYmVJnnufb/4/YhU3rTeEF6UljW SO9UcCSoLHdyhUJ+Mf82zZhTZgCBXdVtRYOZaG8AnjlTq5vFCaqC0HMnlCkY2gbeia tXFJjAQ+Xk48e9wJLeCHuGm0U1fzcaWU91zdr5WMar1FUbeH8BQ3aFM67bMc0e6FYs WF7VlcQ6WXPXw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 5DA6B72E for ; Thu, 1 Feb 2024 09:29:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 087173A054A for ; Thu, 1 Feb 2024 09:29:41 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Feb 2024 09:29:35 +0100 Message-ID: <20240201082938.16687-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavf/mpegts: drop a cargo-culted check 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: v/eiH1wv47Ov This check has survived the transition to AVCodecParameters, but is no longer relevant after it, since the codec context is no longer updated or accessed at all from the demuxer. --- libavformat/mpegts.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index bef00c88e7..1cf390e98e 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -919,11 +919,6 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, int old_codec_id = st->codecpar->codec_id; int old_codec_tag = st->codecpar->codec_tag; - if (avcodec_is_open(sti->avctx)) { - av_log(pes->stream, AV_LOG_DEBUG, "cannot set stream info, internal codec is open\n"); - return 0; - } - avpriv_set_pts_info(st, 33, 1, 90000); st->priv_data = pes; st->codecpar->codec_type = AVMEDIA_TYPE_DATA;