From patchwork Sun Jan 24 15:05:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 25148 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 DA96844B66C for ; Sun, 24 Jan 2021 17:06:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD9BD6881E7; Sun, 24 Jan 2021 17:06:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB7DE6806CA for ; Sun, 24 Jan 2021 17:06:35 +0200 (EET) Received: by mail-io1-f47.google.com with SMTP id u17so21443893iow.1 for ; Sun, 24 Jan 2021 07:06:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QCXoNGVnq33vL3Jmzxzwf1SbLwhpV4Q2jMl0KuQWKZY=; b=cOPDUotREgtNIK68G/a+mwpbQpX5879qbJn+r4QqIXFANi+Pr0blzISDLNBgvY5OcM sYntAwYCfDklw0c58nj7YjkwlslfoRiJSTZAHMSCXmNObHSyKE4w+5e7rjqwnKehnF2v B/xrPYstzUwiefIl4nW63yl7JYY6w2p1GxpxnLZ5b4lB02YjSCOCKDavT6TKdjykvZZW q/GtrPhelRXoo0Kh2aFBjOlf9IWmCtff8VlXjSZ1cNN36eo8PjzrYfXXtEaf0NVil+t1 7kT8Lnb0lSCIa1THhtp/RpWoKKURRsjDjw5GdOZvIa22QhBA4QpnwrCJqzWvilUBpBbR 2iLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QCXoNGVnq33vL3Jmzxzwf1SbLwhpV4Q2jMl0KuQWKZY=; b=a8IlHEePvgkUFK8SFtdcK9E1yQ/SeXyENToOiqyBxzpjqgXPmX6p3Mwf7fubnVlukS lW9CtSj+lvf1FtbZmKok8VSKTO80hIyON0bw/zVJ07fCqgt2DNioQqFX2d1hZsu43vGt Nnm7f3x2u73/azTM/1sbn8uQT5cxEvV4RLjGAkR9IinxHm0KbIXna4hm18rH1H0YjNET Vd41poY47VD9JginyQqGk88+fnpQmLzp4LkUJvGUDmPWKmUiRbBpj/HQbpSMa3AU+Cso Hv6roBvx8+bMGhMDmJHDAgopMP+AvGOMe4H6X8gMNWf/MMPdtj5Ggve3fztSlf7iUTkw NxmQ== X-Gm-Message-State: AOAM533xzXhFPRSLC14QJnj39WBp+dSFU3ID1K28Lwy2+oh8V8Fe56by ZTZVCkBEmVSmyNY/+vdXSIOZtccS0gk= X-Google-Smtp-Source: ABdhPJxV27OdeYF2gJVILzC+HkEY4RmO5JubOiZ9xmlBTzCSV4hja58OQtCVRQ+A1G3fcWPWDXz47w== X-Received: by 2002:a02:3f0d:: with SMTP id d13mr775894jaa.19.1611500793951; Sun, 24 Jan 2021 07:06:33 -0800 (PST) Received: from ip-172-31-39-116.us-east-2.compute.internal (ec2-52-14-134-25.us-east-2.compute.amazonaws.com. [52.14.134.25]) by smtp.gmail.com with ESMTPSA id s6sm9866784ild.45.2021.01.24.07.06.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 07:06:32 -0800 (PST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Jan 2021 15:05:56 +0000 Message-Id: <20210124150556.1089358-1-linjie.justin.fu@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/utils: reset event_flags if extradata is not extracted correctly 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 Cc: Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Regression since 87f0c8280. If the extradata of a stream could not be extracted correctly, codec_info_nb_frames would remain zero, while st->event_flag would still be marked as AVSTREAM_EVENT_FLAG_NEW_PACKETS. The two expressions could be different in this case, hence reset event_flags and calculate the correct score. Fix #9029. Signed-off-by: Linjie Fu --- libavformat/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 6f100294a1..de397a209e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3895,8 +3895,10 @@ FF_ENABLE_DEPRECATION_WARNINGS } if (!st->internal->avctx->extradata) { ret = extract_extradata(st, pkt); - if (ret < 0) + if (ret < 0) { + st->event_flags = 0; goto unref_then_goto_end; + } } /* If still no information, we try to open the codec and to