From patchwork Thu Oct 21 16:21:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shumsky X-Patchwork-Id: 31205 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp787363ioa; Thu, 21 Oct 2021 09:23:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnhP+t7owp8FPuJnKW6iwnTjEF0QOeLEm6fr6OGU4BhabCuKcTM/ATDqodt0Mqtn3tyuhV X-Received: by 2002:a05:6402:2552:: with SMTP id l18mr9032001edb.370.1634833380187; Thu, 21 Oct 2021 09:23:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634833380; cv=none; d=google.com; s=arc-20160816; b=tUDBdgweR8JjYCBvTpF1M6K32E1MhFD7qrattRofNNOEYqPnZqLzfF/YpM9CrJctu6 fNhllpNRZWUN4Vzab1xVxjUDrOQvW7FLzZ2d+YB4q8/wmpZYGMf6r1f1fk4OidUyZenN VUzVrjQ9MMWt9IlJweNd3IwCWYAu+GY7ZnVldn8ZPnsRUr4BUgMsg0DhaO5fKcRkZK2r oDVfMOrjHX2IGz9mK2oSo+6cBX5NWiUbfuaIjlWezxoaR+SxSI0KL+zpX5INjC4yhp7/ 4LCkV/N3k5rojVcI6UiekAv2s5Q7im/H4R1H8sD0Q9k1H2uUDh/6uZ18VRFBgiCYCW16 dCQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=a+CGgcn5nQGq0pBNWJz1GuRfwyK+VKUaEdJflmZTELo=; b=aqdRFd+JvsJwoVm9JyhSfZl2g/lkd1YkPY5+5VU053ZerGP2zYKW6qEND+O+QJl85F JKJI3g2+2lkd4JmwV5Te6tg6n1MPMoja/LTObvQQOYn6L8YcaBNIdchgwdk7dLAAizGY I8GTJh4AkC009gKBAoXwZbwa0zliTuaYEWm7R3x+cRuGXrtYkfAjZ6ELdx/DyGf9y2V8 nJSIVu2Ng2rmVeMJ6rP8troM2P3WzhVle+4LqZXNQGWBN35aYB+tnhAdHyF6/MEGRYaN rrYYsClKS2ZUn6hJ2Qr6o0I9SLl975tDj9wfKdfqT/fpLia6gVx+BSGQlkOVs0okEwnS 9SGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ktnSSqWQ; 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 dd10si8963911ejc.222.2021.10.21.09.22.56; Thu, 21 Oct 2021 09:23:00 -0700 (PDT) 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=20210112 header.b=ktnSSqWQ; 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 EB19868A58C; Thu, 21 Oct 2021 19:22:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0188A689981 for ; Thu, 21 Oct 2021 19:22:45 +0300 (EEST) Received: by mail-lj1-f182.google.com with SMTP id e19so648103ljk.12 for ; Thu, 21 Oct 2021 09:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oA/Yh/S97rNjB0yE5rN9L1kIHlRzPIWNVuA9tiMLffs=; b=ktnSSqWQ5q7twwwtYf61t7SAmWDSiPAsUgMnm4dfjZlVHZnYqi4klmIQFaiI7utxpK DVSO7XgEUDMNcjXJyh9bpEfHuc4k7OOokrPXo3UdL5m7Kxf0fRyPeJxhfsMOmb5Mbayc pRfI/TrJydKo17ng1pmPydFeifPurCSx79YIhCrufLlZGH9kXdX8zaPg67IPuK0ygube 4Hcc6Lsfm8cVmSse5ywYZdPWrC0zIGPyFdhfbC6LnGTs4h7icChqTcP6OSBGGxHiHqyk rNulUzVR8dZgVqKeONnyi4ONdILAqqtUN58RRD2ZA+H3l/U2lXW8o+Zs73hMydnVYcql BV6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oA/Yh/S97rNjB0yE5rN9L1kIHlRzPIWNVuA9tiMLffs=; b=3Kpulog3x1D19Hxp6obcADo9OfGNX/PEj9bdd3CHSv/5/8GGqCRo/nQmPhwnK1dNF6 PtjzhvWkNeK9Ht7W47kFo6LUT4gowRfNxQ83jjaKVpeyJ3CS5pf/UqO3C69upw2PcX/V Vu0KZmkO26ulLSYHN/1Oe/rJ0mCMT0PeCQVaf+gRK4UUSF+s/mOxxwvZV1RE5XZ/Q07l lQO1XkJTMiTm9OITPeDxomGQDOUYhyJgfYePxE37dLk3/7Mn1AS7UHArxP9vs5xnSEVd /gzf7W+0aBChJKxO4Iy2tim+SDcLMtJIRLWovU7AC95KpDgeH8JV3gCPg03CLLB73qK6 8KqQ== X-Gm-Message-State: AOAM530glM24SXha0D70N7b+NWZxQa5wB5gmVwGJAAtYh762ScWWsX/8 o3p0Fxn4E/ib8y3oT0UrPK2SHxmWNXHSHQ== X-Received: by 2002:a05:651c:544:: with SMTP id q4mr7028526ljp.51.1634833364866; Thu, 21 Oct 2021 09:22:44 -0700 (PDT) Received: from alex3d.netup ([2a03:e140:1:0:ac50:6239:8816:4aa0]) by smtp.gmail.com with ESMTPSA id d20sm498927lfg.8.2021.10.21.09.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 09:22:44 -0700 (PDT) From: Alex Shumsky To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Oct 2021 19:21:31 +0300 Message-Id: <20211021162131.1437150-1-alexthreed@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/demux: preserve AV_PKT_FLAG_CORRUPT in parse_packet 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 Cc: Alex Shumsky Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ksoD5ZcE2pcz If original packet is corrupted, then parsed packet is probably corrupted too. Let the application decide what to do. Signed-off-by: Alex Shumsky --- libavformat/demux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 6a4b687bf1..71a1a9bf03 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1179,7 +1179,7 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, out_pkt->pts = sti->parser->pts; out_pkt->dts = sti->parser->dts; out_pkt->pos = sti->parser->pos; - out_pkt->flags |= pkt->flags & AV_PKT_FLAG_DISCARD; + out_pkt->flags |= pkt->flags & (AV_PKT_FLAG_DISCARD | AV_PKT_FLAG_CORRUPT); if (sti->need_parsing == AVSTREAM_PARSE_FULL_RAW) out_pkt->pos = sti->parser->frame_offset;