From patchwork Mon Sep 28 17:04:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 22647 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 3FFE6449EE6 for ; Mon, 28 Sep 2020 20:29:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22E4768B73A; Mon, 28 Sep 2020 20:29:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3765B68AD4C for ; Mon, 28 Sep 2020 20:29:44 +0300 (EEST) Received: by mail-lf1-f66.google.com with SMTP id z19so2253739lfr.4 for ; Mon, 28 Sep 2020 10:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/DQCPXq1uO+sP1YxywHIuE2wFMLUkwTr5/lvoQsMNug=; b=vE7/jwWT/HTLl3ltpfpuke4bvwaMhoxEiooq33+mWTdoPEr5IejuguJ58MOuVQpun7 SMMcBh+XwQJPjmBsFMDyv6O5/qdc15socuaMiXonGOOCQzuc9SCwSJBTyvWPNF7oHRMC EZ0zFHPuKMGBr7tlUIcsXZy8eWMfZym1nkrf5QoOrfikIDRNP2EUjhdxgYKedyyRCP96 eYM5oOXHoj+/NOSojE5NEVOZqa2lz329LVE6wWnqqGX35AWb2aWALnLbGM+dkoXRQomX M3NJz1DJBo4VBtKNDyuRnSeN2FcFaMZ9bDqKQci3R3MH5+mxNwThxKDuSdppemAADGbv 5aMw== 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:mime-version :content-transfer-encoding; bh=/DQCPXq1uO+sP1YxywHIuE2wFMLUkwTr5/lvoQsMNug=; b=OGBzWFHsx+8uTa5UnUAziO7Y3u/MS3eBVbzoHd8xzRwwrN40ytd22OZwpyzzthFjoW aBNeEsK7GwWApXaN+1STwa/SqaSHOPog7yKLxYqUpBJPkHOUOZ22nG+yVEl+hFlhBOYS TS84r/cdkrbNy3gdfD4JwblkgEGle6AbhgCRtalEreFLvffSbswwTJpD/WN4svdcjlAZ wAz8efd0ptjcFN7iBKFT/3AS+H+QNXOVpGGvnCHL4HhTU4SauGFgQ9Nv3+PuU136vKTL Zmi6lZkj1pUs7DQoLNtV17ZIQ7fb38aKs9YQZUPbhA5WbMGuXdU8PLc/zukf1BT0KS+R rP7A== X-Gm-Message-State: AOAM530krZxOLbZhIEU/O/lUFs4AqSr7fJUhruREGz88k0dNAqMYxnCL tLw+1bkAw1ycvSbMW3esvBWbFdwzNgw= X-Google-Smtp-Source: ABdhPJxZx/tg74L9re7ptKeWNUVDgDBPK5zlD/P3hh/Kuh1sHzCKph4rc5KmpU3VBnCQH/EL0fwX2Q== X-Received: by 2002:ac2:4315:: with SMTP id l21mr861844lfh.494.1601312682531; Mon, 28 Sep 2020 10:04:42 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id t2sm2942087lff.150.2020.09.28.10.04.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 10:04:41 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Sep 2020 20:04:40 +0300 Message-Id: <20200928170440.7779-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/movenc: exit calculate_mpeg4_bit_rates early if track lacks required values 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" Missed due to lack of FATE tests, but chapters are a movenc track w/o an AVStream. We also expect the codecpar in the track, which we are utilizing without checks. Thus, cause an early exit if it is missing as well. Fixes #8190 --- libavformat/movenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 20768cd45f..a17fa6757c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -641,6 +641,12 @@ struct mpeg4_bit_rate_values { static struct mpeg4_bit_rate_values calculate_mpeg4_bit_rates(MOVTrack *track) { + if (!track->st || !track->par) + // if there is no AVStream or codecpar available for track, early exit + return (struct mpeg4_bit_rate_values) { + 0 + }; + AVCPBProperties *props = (AVCPBProperties*)av_stream_get_side_data(track->st, AV_PKT_DATA_CPB_PROPERTIES,