From patchwork Wed Nov 6 02:49:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16129 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 6043D447DB1 for ; Wed, 6 Nov 2019 04:50:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A8E068B0C2; Wed, 6 Nov 2019 04:50:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EF2568B0A4 for ; Wed, 6 Nov 2019 04:50:54 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id z26so1627843wmi.4 for ; Tue, 05 Nov 2019 18:50:54 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=a/3thX1HqvyiMTUWcX2h8fCKj4TLhdfW/GdofSooiog=; b=iV4yzarE+z7Oys7UToZYTgI8AVdMgElWagVj8W7uUPJaV4A/Og3q5TO9I+w42pCh+K jiO7EEhRC3fFoCD5volY6Mk72gUcRvo955IXIMjfxyrOpSMnJfJ0GCILR5F4rlyTHBi4 LgR1YaATUE1COFZ9GJZIfVGiBn8XbSfvGmgFh7OQdWpDOTaWGeGadJs8IO26zPIG5CeV qCQnS2DLKxwyuQuSaP1vkZMzKwZ1r00vc38NyYKnc67VPSHu4l1ZmSGWXFlGMVSOlmDo gTn3/TRk0rx1X+rjJD1H0gMaE3eUBve9cZX8XExa52rbLaakyCkWSM1Ey9S5UaCtuHkz FZIg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=a/3thX1HqvyiMTUWcX2h8fCKj4TLhdfW/GdofSooiog=; b=FpnLJe4/P9tcjA2Kc2UfBvzB/if1mY7ADMKFoOv6Mnj2y9zdFPh7Q9n+5tOnlolrJd qKEHC0abR3bEhiR8fPdarV0PxHC5paQDhdvDCpwRYFy42CVpG1n4eKPXZaDsrVtjTNW1 OgYyniABuh7/X4/3Np2XuR5ijyXw8y16FBLzs3/LIUW+7S2gWHhB7Pur6WzSrobgbv74 nvIk0f2+g9/LnrM3hksQVCSccyksYmeEe18yD21fNkueklWPFIxOBWjdgzhSpU97DIK8 Dh8sxCpPn2eGwmf0C4r9fCPYfCBLezWklYT/Lfc/TD/PyaDpt3Gu2Dqges1XeK1RSF+l V8iA== X-Gm-Message-State: APjAAAXcj8CjuuVF1KL3ydtPeYCOrhr7nsTJWMgpzB3wXtmN0xwoptQu Vh3UcjG4WGF1h9gBTvfEATGkWyhr X-Google-Smtp-Source: APXvYqwCrSbEWbw7HyDa4RX1ZkdJgdG1XD2oXBaDeoJUsFCafCdJw8zHEkslLP5MkMAYKCXleDcJnw== X-Received: by 2002:a05:600c:254f:: with SMTP id e15mr288490wma.37.1573008653444; Tue, 05 Nov 2019 18:50:53 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id l13sm1281710wmh.12.2019.11.05.18.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 18:50:52 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 03:49:16 +0100 Message-Id: <20191106024922.19228-17-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/23] avformat/matroskaenc: Allow empty filename for attachments 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The EBML as well as the Matroska specifications allow empty strings, yet the Matroska muxer enforced the requirement that a filename tag exists for attachments and errored out if it didn't. This has been changed: In the absence of a filename, an empty string is used. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f84e50f94e..e64e1e1036 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1677,6 +1677,7 @@ static int mkv_write_attachments(AVFormatContext *s) ebml_master attached_file; AVDictionaryEntry *t; const char *mimetype = NULL; + const char *filename; if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) continue; @@ -1685,11 +1686,11 @@ static int mkv_write_attachments(AVFormatContext *s) if (t = av_dict_get(st->metadata, "title", NULL, 0)) put_ebml_string(dyn_cp, MATROSKA_ID_FILEDESC, t->value); - if (!(t = av_dict_get(st->metadata, "filename", NULL, 0))) { - av_log(s, AV_LOG_ERROR, "Attachment stream %d has no filename tag.\n", i); - return AVERROR(EINVAL); - } - put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, t->value); + if (t = av_dict_get(st->metadata, "filename", NULL, 0)) { + filename = t->value; + } else + filename = ""; + put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, filename); if (t = av_dict_get(st->metadata, "mimetype", NULL, 0)) mimetype = t->value; else if (st->codecpar->codec_id != AV_CODEC_ID_NONE ) {