From patchwork Wed Nov 6 02:49:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16132 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 6C3FD449A15 for ; Wed, 6 Nov 2019 04:56:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4900968B0D4; Wed, 6 Nov 2019 04:56:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F23D68ADB4 for ; Wed, 6 Nov 2019 04:56:23 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id a15so23908590wrf.9 for ; Tue, 05 Nov 2019 18:56:23 -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=+cy/SCAO9IboncSih/RJxv7oJesxoblBhRwn35aFGu0=; b=nMWTQ5ij1dzcgd7X1MYAfEOXX3o/SYwfr7DHazm/b54GZqLo7rl5DW4Z7rDzjKOinT sWcA2ZQN5Co67F8sex9fbVrYJ8noUs1C579W8tey0OWx87KN6v3eDTLeEFI2XP3pOSPT loc1rngFQOzMi7nPPDEMD9BaaWOaK3Hlw4nQ859FGkeg2ohn4wWQcdP9YzVCmC2pY7Em Yr2vo+wF5AX8VE5rKUdSGXZoAIQfWJ0VeZ/kzWntt1EebqUOuEqRM84ZXSACzDdSd4O4 TibM9vx8XTWaPhxnQ9TtSJesgRN0t3cn+HvRl3DhglWCW6PjdzbJfgDQPqk/VGfpjZCZ 7TEA== 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=+cy/SCAO9IboncSih/RJxv7oJesxoblBhRwn35aFGu0=; b=bwSWHY7scht14Fta4n9OR0nxWzKjW8vHTqw4OtZZud5CgBURd6m3d7X9obhw4eGV9q wiX6cGJ1UbuBllVms5VPIG6RsDfscc9ihLGJjTbPoCu6TcCKO9aCun365v/hhxv/LWbk Esx1rcCYmWOkxMDrh47Hx5v7eFHtTMNhdsIX1oJXMYPXjDVRmUh6CsgsIqLXkIoVUAv1 qcHRWUOUEOnRYbFlMx8jK/zIMPEs9fi0F1O9FupVLpgZqdp5SOOWdoCJmbh4RzYh3RaT mrXNQRh+T+g9BdlcEAHq/i54mqZEKROKvU54YvCIqxADVkysFjfj3F9wx3N0ZqZAXsy6 7Cug== X-Gm-Message-State: APjAAAXAu/dUh9lPFlPMfj3gs0qQ7OEjDp5TUI66IipYkqHBUgfzkKzD XAqGpjI/WgmVHK29eiRFoB22a5vS X-Google-Smtp-Source: APXvYqyGTGWdkNF4SyM4gn/cizznxS8tBH5GAzjFim6iZEVJ22p3N+PrFKm6738AIfgXUqQWmU+oFg== X-Received: by 2002:adf:f40c:: with SMTP id g12mr396909wro.244.1573008652453; Tue, 05 Nov 2019 18:50:52 -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.51 (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:15 +0100 Message-Id: <20191106024922.19228-16-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 16/23] avformat/matroskadec: Don't forward empty attachment filename 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" While the Matroska specification allows the filename string to be empty, forwarding an empty string as tag is useless. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index c224c3447a..0d15c634ee 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2881,7 +2881,10 @@ static int matroska_read_header(AVFormatContext *s) AVStream *st = avformat_new_stream(s, NULL); if (!st) break; - av_dict_set(&st->metadata, "filename", attachments[j].filename, 0); + + // Empty filenames are legal and accepted, but useless. + if (attachments[j].filename[0]) + av_dict_set(&st->metadata, "filename", attachments[j].filename, 0); av_dict_set(&st->metadata, "mimetype", attachments[j].mime, 0); st->codecpar->codec_id = AV_CODEC_ID_NONE;