From patchwork Mon Sep 28 20:57:29 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: 22652 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 E8F9E44BBE5 for ; Mon, 28 Sep 2020 23:57:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C66236880C9; Mon, 28 Sep 2020 23:57:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80617687F68 for ; Mon, 28 Sep 2020 23:57:32 +0300 (EEST) Received: by mail-lf1-f65.google.com with SMTP id 77so2970333lfj.0 for ; Mon, 28 Sep 2020 13:57:32 -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=RwGY0ZDEawoeNw/2IFTE+10P9kY4KPsB+zCNG57hr7o=; b=FRnD3ppFpyYL1z6wX2kOVHP+5uuqvRk+1j7fLzlxPR++3Cbc1KpTPLDNYWcOdaOg8D iAPESsckYkIeXH6iWnHKTAwKGEt50bRYbtkBYzlKikOJcCpDOwy6XjIsLUeTfR99tKG2 zQDGCTCxGiedVL6EehdxYgGhska8mmw6w399B25WiJJrTNZK5xuEoMLVJ8bs0K4sMEKy OYhCPJswocxtaNfe12qMk23cur6yeLnGhxT0p1jSoX8ZM2elU6f3Rg1HGnNF0BNoTeKA Ud8DL99rBtnms6fxrSbdBS2LuBcrMFpu1Kg3m5RIZb0DTqyK1maqfGzGATLQmCLyxS2u 7P5A== 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=RwGY0ZDEawoeNw/2IFTE+10P9kY4KPsB+zCNG57hr7o=; b=QhGnOiYf6EBrqwv3H4wLRfPEp9iFGJBcdAuMvdylPX7oAzbSHMIL9Wl0FoiXZ02mfy kCxYb8oLfLWIYPlASnraNuhcXVxS7SFG8QwJwPZZx+tqeWPtxoB8lL+ojHh6g5+Yud3U 1KY0UdbOYghYKGC/vHj3B4n+OHUtPObAH7ta5ND/e78xhjTfdVZc5mzFobjbts9GUh1l SoctWTLyn2o/MW5K027yD+NRn5aGCRfZxV7rcR9tLBf+9+cHzvVeJbbDQ8aYp6n6bU7b 447+dinFhHRzqGilT6SWkMyqpgXwJ25eHpow/QeLZT9DYMEJ9u6yygQo6Aqo5rbcnfp2 XeCA== X-Gm-Message-State: AOAM533MWF3Ui+kxiJNz/2qksUtvrW27W5ZzR5zk5AXnNKzP6IA2BpMp pDqfr7iklNP0D3DJNyH1DEV4zdmN+1A= X-Google-Smtp-Source: ABdhPJzqbCZOT6Ydzl+L9Jm3xcC8/LqzwqjoDIoaNMakwt2UPe3+PQQiGkxfbsYE12X3PB+xNNieOQ== X-Received: by 2002:a05:6512:52a:: with SMTP id o10mr18370lfc.596.1601326651389; Mon, 28 Sep 2020 13:57:31 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id v11sm2986282lfg.39.2020.09.28.13.57.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 13:57:30 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Sep 2020 23:57:29 +0300 Message-Id: <20200928205729.9064-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928170440.7779-1-jeebjp@gmail.com> References: <20200928170440.7779-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/movenc: handle tracks w/o AVStreams in calculate_mpeg4_bit_rates 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" The generated text streams for chapters lack an AVStream since they are but an internal concept within movenc. Fixes #8190 --- libavformat/movenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 20768cd45f..c1ff922e88 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -641,10 +641,11 @@ struct mpeg4_bit_rate_values { static struct mpeg4_bit_rate_values calculate_mpeg4_bit_rates(MOVTrack *track) { - AVCPBProperties *props = + AVCPBProperties *props = track->st ? (AVCPBProperties*)av_stream_get_side_data(track->st, AV_PKT_DATA_CPB_PROPERTIES, - NULL); + NULL) : + NULL; struct mpeg4_bit_rate_values bit_rates = { 0 }; bit_rates.avg_bit_rate = compute_avg_bitrate(track);