From patchwork Wed Mar 14 06:24:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 7982 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1636494jad; Tue, 13 Mar 2018 23:26:03 -0700 (PDT) X-Google-Smtp-Source: AG47ELuSK0+bgBO1lc25vYJcYk1Ti/CvbSuhrOPTRQnqYEtNVo2/LYuHrt4hTKiWksP6XzQsXM+5 X-Received: by 10.28.182.139 with SMTP id g133mr539395wmf.158.1521008763202; Tue, 13 Mar 2018 23:26:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521008763; cv=none; d=google.com; s=arc-20160816; b=zLPqeCvqqXmhfMvlVSMgxNf1MzOOGW9AH2LnZhReuQD9lwUm/yYrrVhPWzSyVeB/r+ fsY+xSKhscvgrzEP72/oo5ud/g1r46DIGAGronTmNQvq9NbG+Gxuxji392kLTZsWh11H OTOvA3pNXUfxmMX42TzE7UbnQWLQZi7kspMC7gsng6gi5wzciORy5AAUvGyw7xjYDQr4 r9HdTrO9KKvmyauXTY3+4kaWSxQ74FYQC7igPXN4IXW4CLm+kGwT6Soxvt/RQdMH2Afv 1Ypn5SQnGsqu1NaRBAjYTtQL1GN2TSU8pHFg8fOqaKd+COeyMs4hDAuj22aoIHI5OlQe JoWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=QxVToRCieZCl7okL+eS/ZpjMINxL7JqHZjQ4PP9XoRU=; b=bTURT75kcixwMVeK87MqzXOWmLAOLqMx9U9NOhmW0aIwVUWDIUnsle86lg+9/owxZ3 xZk0zWcsZZrJ4wHH7KgbSZTvsMYaKk8XkXyWk9g+6Oj+YoStKDcXHN3rxeOuIR4LGblM xKYUGepxnVzWfZ2TDywUjZEy/C/wvQijDJwXuYDLvC+V0L880TYhYh7oVT9yYeQeVXnC pFr/mJEQK64iWeZj4hICXwilCA902LQbW5x+xaCR8ZeqvC2UgbEGhB0GncslhCXAubHx cDmQqY7f7cGq5SSC9/chxOB0ZLgHWayd0VGtq8BM04S1v6eTFCCNuM9K0pu9XyOleIU9 Bb9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TtmauApa; 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 h33si1311218wrh.419.2018.03.13.23.26.02; Tue, 13 Mar 2018 23:26:03 -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=20161025 header.b=TtmauApa; 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 01446689BB7; Wed, 14 Mar 2018 08:24:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f177.google.com (mail-io0-f177.google.com [209.85.223.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C25FD689C67 for ; Wed, 14 Mar 2018 08:24:45 +0200 (EET) Received: by mail-io0-f177.google.com with SMTP id v10so3000275iob.6 for ; Tue, 13 Mar 2018 23:24:57 -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; bh=38zUOlZOeWIMsdWFB4H3UqHXD6GMTEGb0rY2yY+7HF8=; b=TtmauApaAhT+trnS5TSTHoHc56ayo/BGQXONtGFgxJ+WO3SxQ++FyXPflYuNY2W5oL wIGQSffR2fPyM/ZTPuU0UnB4T7mTh378s4h07O2sDfw6+XV6wYAj3pLMx/EDzPUCmSN6 KbW96bIa+WlLmu2VvdAAKhd7f9a5zkuWMRzB55XHbYq45rKcbpIvC2ONz6tIhYMuqNX0 3yk/NmMpoabqRxk11gLx3x/dssl+Ip4Lh4aZ/HBz/9R2e2/TTnaVpm1hOomintrAGbhO s57gsfTTTNGMY2lYlPMH0YSt2Pttyc8j+FWLTmTbospAdtGpGUh4w0dWjIPFwq34NUJu IdNA== 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; bh=38zUOlZOeWIMsdWFB4H3UqHXD6GMTEGb0rY2yY+7HF8=; b=jAEPakRhQimHbet7y3n56UXDa9w/DZvtJeQAg7oFaO5V9LIgTATQHN7RpYalF0yg2S pdRk8ApwAJNCDzmc0StI6iNAFO+uiZUhFuswVAmOKfJgrpplY2/b0q2EMoADAJrnKdCg hijGhWt2FdJEIuS3a13BV+DujQQSVDzSOdGhak10RN28adCT1rTLsTwO8dMQIgGxHI2g 34fYRFfcnMwWT/hSRG0nbWY+n4s8eTn+UkPXM49q9Njfrn9ldlwf6pyLUFwnxDT3KO+f KGyjzo9z9nLx9BtWWW5+urxdkZr/o/5oADtaFpuV+dfVnUKoOax6z0krbC1PTs67Ppv5 3qlQ== X-Gm-Message-State: AElRT7G+pF2B0lq4lT5ap+1CP3Mz0ulSooVf3n9SxdofQNjGMiy+VLDF 28V/bASxA8B03lnILGpH9l+AMDpi X-Received: by 10.107.180.136 with SMTP id d130mr3470643iof.129.1521008695849; Tue, 13 Mar 2018 23:24:55 -0700 (PDT) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id v134-v6sm394596ith.27.2018.03.13.23.24.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 23:24:55 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Mar 2018 01:24:43 -0500 Message-Id: <20180314062445.89909-8-rodger.combs@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180314062445.89909-1-rodger.combs@gmail.com> References: <20180314062445.89909-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 08/10] lavf/matroskaenc: don't rewrite extradata if we already have some 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" matroska doesn't support mid-stream extradata changes, and rewriting the same extradata already written in write_header would cause errors since we previously didn't write a filler void. --- libavformat/matroskaenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5950b4de44..e4db5a9a1c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2266,7 +2266,8 @@ static int mkv_check_new_extra_data(AVFormatContext *s, AVPacket *pkt) switch (par->codec_id) { case AV_CODEC_ID_AAC: - if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) { + if (side_data_size && !par->extradata_size && + (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) { int filler, output_sample_rate = 0; int64_t curpos; ret = get_aac_sample_rates(s, side_data, side_data_size, &track->sample_rate,