From patchwork Wed Aug 12 18:25:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21612 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 DF0A8448F08 for ; Wed, 12 Aug 2020 21:26:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1FF268B524; Wed, 12 Aug 2020 21:26:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0672B68B53F for ; Wed, 12 Aug 2020 21:26:25 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id g26so2956360qka.3 for ; Wed, 12 Aug 2020 11:26:24 -0700 (PDT) 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=MrD7k61EPbZTzVRnJwUJ6wnjPGfjOuzDe/dc9dORBOs=; b=adArnMMDhNWuL8M9ayOy5l/Vi9KUXbDZMNEdGsCQFH/NZCN0gIEPMkAtC6fDjGU3cV N+2ElJPEGgQbpk2EDb4WXdzigkNYw7q5ZtAClZLdOtQsGFEGrUTFdGCg1Z8HFuHaIvt6 WWNxWzurZ//cdS0oJLWbziM3g60i/7hv6t357xxDzyxjxx6QQ66xRLnu8lqcfpod5cyv KMgJ1lLxbV/vZtuLkX1dOavDa1k250D3iUgcny494/XGAFMZETzMHFRfwniTxRj1Ptu6 OgN/L5rn1FqeLi9qaLz/TJkxdl8AlRaQ+2oboWDxSKaBVXlCDoZcxHpL8GGK/u6xCspq Cj7A== 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=MrD7k61EPbZTzVRnJwUJ6wnjPGfjOuzDe/dc9dORBOs=; b=LGyytjLxUKtsoZyFNKxXKLmsyz9/swwBJy5Iq/434NmA6GRIpJn4vCgyaebjH2r8ZK x99FQPr1A+l4BUSUxGx1LYs8XF5KsAOeiGM+J62bOg4TAlNBe1mFE2Ot/ZpDq0Ioktvc 0WuZgbOmHiZ9P+cf3ZwSzw8VSX/eRxuXyxH0ljJgSf1ntXQdgnzlgg6OtvuSIRNhQWik 2Zb6Z/JHGq3ngJoyKWObMlFE9eW0cQjoSOYXchkNiuQncWVCp4RhYWxKc8H/Pq1ych6Y lTH6QTqJ7mi8tvkEh4N735Q30nlB7TXoRhjj/q+/JnWdV18yFODkDT6kd7AHxWvyw4/I 0dCw== X-Gm-Message-State: AOAM530QteqqxBtZzaLKSL4mbuaamjtX8EpaBj4uSogm1wXD6xO43Dfe E2/JDqg6OVeTSeu9APeMg/a02CHe X-Google-Smtp-Source: ABdhPJxkG//hp7JWmuo769bp+p5RQxZhcsPBLl0cieCZgz5R3szSOgOZyLsVcXb5QAc74uHvaVFupQ== X-Received: by 2002:a37:a882:: with SMTP id r124mr1184101qke.56.1597256783256; Wed, 12 Aug 2020 11:26:23 -0700 (PDT) Received: from localhost.localdomain ([181.23.66.204]) by smtp.gmail.com with ESMTPSA id x29sm3266889qtv.80.2020.08.12.11.26.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 11:26:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Aug 2020 15:25:58 -0300 Message-Id: <20200812182558.14199-3-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200812182558.14199-1-jamrial@gmail.com> References: <20200812182558.14199-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/h2645_parse: reset the H2645NAL type value before parsing a NAL header 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" This will prevent reporting a bogus value in the log message when the header parsing fails. Signed-off-by: James Almer --- libavcodec/h2645_parse.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 5708fe56f9..162272a6de 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -501,6 +501,9 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, if (ret < 0) return ret; + /* Reset type in case it contains a stale value from a previously parsed NAL */ + nal->type = 0; + if (codec_id == AV_CODEC_ID_HEVC) ret = hevc_parse_nal_header(nal, logctx); else